News for hackers. Stuff that matters.

A comment on A Git catastrophe cleaned up. Parent comment

Re:A Git catastrophe cleaned up by CaptSpify on Wednesday December 21, 2016 @03:45PM (#13232476)
> 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.

[ Parent | on HN ]
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).

[ Parent | on HN ]
Re:A Git catastrophe cleaned up by CaptSpify on Wednesday December 21, 2016 @05:39PM (#13233288)
I typically don't have any issues, but I guess that would heavily depend on your workflow.
[ Parent | on HN ]