CODEWITHSUNDEEP
gitgit-merge
Bradley Kaiser
Bradley Kaiser

Reputation: 774

How can I make resolving git merge conflicts easier on command line

I like to resolve merge conflicts on the command line, because that way I know exactly what I am doing. This is great for pretty simple merges, but if things get messy, it takes a long time. Are there any command line tools are techniques that would help?

Upvotes: 1

Views: 84

Answers (1)

martin
martin

Reputation: 3239

I use the following in .gitconfig

[merge]
    tool = kdiff3

[mergetool]
    prompt = 1

If I now perform a merge with git mergetool, then it'll use kdiff3 which is much better for complicated merges. Of course, you can adjust the mergetool to your liking, see How to resolve merge conflicts in Git?

Upvotes: 1

Related Questions