Alex Rivera | Logout

Questions tagged git-merge-conflict

2 questions

Sort by: Newest Votes Active
14
votes
3
answers

How to setup the git mergetool with the --dir-diff option?

git git-merge-conflict
asked 2013-04-01T11:43:54.593
10
votes
2
answers

Merging git notes when there are merge conflicts in them

git git-merge-conflict git-notes
asked 2012-08-21T12:54:56.957