Question regarding file conflicts

[erik.spe...@gmail.com]

Hello! I am just wondering about a difference I see in conflicted files and what is described in the documentation.

In their it shows the example:

<<<<<<< filename
your changes
=======
code merged from repository
>>>>>>> revision

However in my  file it looks a bit different:

<<<<<<< .mine
//Last modified: Wed, May 20, 2020 12:57:47 PM
||||||| .r6046
//Last modified: Thu, Mar 19, 2020 11:55:12 AM
=======
//Last modified: Thu, May 07, 2020 04:52:08 PM
>>>>>>> .r6255

So I am just curious what the three different sections mean, thanks!

[Stefan]

the first one shows a two-way merge (e.g. when you get a conflict while updating), the second one shows a conflict from a three-way merge (e.g. when you merge changes from another branch into your wc).