In this example, what would that line or file need to look like for the merge base to match neither…

…e merge base didn’t have the line, then clearly “main” added it and the merge result should add it. If the merge base doesn’t match either side of history in this region of context, then you’ve got a merge conflict.
Optimizing Git’s Merge Machinery, #1
181
2
Palantir
Michael Flores
·Follow
Apr 10, 2021
--
In this example, what would that line or file need to look like for the merge base to match neither side?
--
--
Written by Michael Flores447 Followers
·767 Following
Fan of tech, code, and coffee. Occasional starter of new things. Learn more: https://michaelflores.io
No responses yet
Help
Status
About
Careers
Press
Blog
Privacy
Terms
Text to speech
Teams