Handling Conflicts after merging objects

jhanvincent14

I'm currently Merging 2017 modified Objects with 2018 demo objects and I can't understand what the meaning of this (See Attached Photo)

Can someone help with this ?

and this is the .Txt File

vaprog

Look at the .txt file in the same folder as the .conflict file. You will see markers like so:

{>>>>>>>} ORIGINAL
...
{=======} MODIFIED
...
{=======} TARGET
...
{<<<<<<<}

jhanvincent14

vaprog wrote: »

Look at the .txt file in the same folder as the .conflict file. You will see markers like so:

{>>>>>>>} ORIGINAL
...
{=======} MODIFIED
...
{=======} TARGET
...
{<<<<<<<}

Hello, @vaprog . thanks for the answer. I've search it but there is nothing that looks like that in the .txt file