3 ms·
> 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 peo
by cyphar 10y ago
> 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).
- CaptSpify 10y agoI typically don't have any issues, but I guess that would heavily depend on your workflow.