You will see this as a link above <<<<<<< Head in Visual Studio Code 1.17.2 when a file has a merge conflict. Clicking this link just takes the inbound changes and throws the others away.
Addendum 6/27/2018: I experienced a surprise today in pair programming with a coworker who was using this trick to pull another codebase into our own while our own codebase was winning in "Accept Incoming Changes" collisions. Perhaps "Incoming" suggests not literally of the drug in code base but instead which file was changed most recently.
No comments:
Post a Comment