Re:A Git catastrophe cleaned up
by cyphar on Wednesday December 21, 2016 @04:26PM
(#13232761)
> I use svn to merge branches every day.
Has it gotten any better with conflicts? From what I heard a few years ago, it's still absolutely shocking (if two people touch the same file you can forget about merging your branch).
Has it gotten any better with conflicts? From what I heard a few years ago, it's still absolutely shocking (if two people touch the same file you can forget about merging your branch).