News for hackers. Stuff that matters.

A comment on Mercurial developer responds to "Switch to git?". Parent comment

Re:Mercurial developer responds to "Switch to git?" by weaksauce on Sunday November 17, 2013 @07:05PM (#6751664)
it's not too bad in git. you just look at the merge conflict markers in each of the files specified, delete or merge what you want in each of the files, then add the changes to the staging area, and commit again to complete the merge.

this might help: http://stackoverflow.com/a/7589612

and this: http://git-scm.com/book/en/Git-Branching-Basic-Branching-and...

[ Parent | on HN ]
Re:Mercurial developer responds to "Switch to git?" by rallison on Sunday November 17, 2013 @07:16PM (#6751709)
Even better, one can specify a mergetool in their config, and use a standard diff tool to resolve conflicts.
[ Parent | on HN ]
Re:Mercurial developer responds to "Switch to git?" by taspeotis on Sunday November 17, 2013 @08:25PM (#6751972)
At work, my Git repos are exclusively C# and I've been using SemanticMerge [1] for resolving conflicts to good effect.

[1] https://www.semanticmerge.com/

[ Parent | on HN ]
Re:Mercurial developer responds to "Switch to git?" by voltagex_ on Sunday November 17, 2013 @09:01PM (#6752091)
It's a pity they're a subscription and also they want me to log in to view the pricing.

Edit: There is a once-off price and also somewhere to apply if you're working on open source.

[ Parent | on HN ]