3 ms·
> Unless you need branches (and merge them), I use svn to merge branches every day. I do agree that git is probably more useful for more complicated setups, bu
by CaptSpify 10y ago
> Unless you need branches (and merge them),
I use svn to merge branches every day. I do agree that git is probably more useful for more complicated setups, but svn is very capable of branching and merging.
- 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.