7 ms·
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 ad
by weaksauce 13y ago
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 http://stackoverflow.com/a/7589612
and this: http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging http://git-scm.com/book/en/Git-Branching-Basic-Branching-and...
- rallison 13y agoEven better, one can specify a mergetool in their config, and use a standard diff tool to resolve conflicts.
- taspeotis 13y agoAt 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/ https://www.semanticmerge.com/
- voltagex_ 13y agoIt'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.