2 ms·
> Have fun merging... I just did. As long as the changes in branches B and C are to different regions of the file the merge is completed automatically. If not,
by fr0sty 15y ago
> Have fun merging...
I just did. As long as the changes in branches B and C are to different regions of the file the merge is completed automatically. If not, conflict markers are places in foobar.foo.in for you to resolve there.
Not sure what more you could ask of your Version Control System...
- yxhuvud 15y agoI might have misrepresented the case a bit. It involved a rebase, and rebase + parallel renaming makes for strange things to happen.