You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
When you have a conflict and materialize the conflict markers into the working copy, can the markers give some hint of origin for each version of the changes like revision IDs?
For instance the conflicts in a file will look like
<<<<<<<
%%%%%%%
some version
+++++++
other version
>>>>>>>
but without context on where these versions originated from, it can be hard to figure out how to resolve the changes. Could there be any kind of hint IDs/descriptions maybe after the markers on the same line to give context?
joyously, samueltardieu, julienvincent, BatmanAoD, neongreen-sc and 4 more