Take the 2-minute tour ×
Programmers Stack Exchange is a question and answer site for professional programmers interested in conceptual questions about software development. It's 100% free, no registration required.

I sometimes prefer to work in a terminal. I use git, and sometimes have merge conflicts. Are there any merge-conflict-resolution tools that work in a command-line only environment?

share|improve this question
add comment

1 Answer

up vote 5 down vote accepted

From the manpage of "git mergetool":

Use the merge resolution program specified by . Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, diffuse, tortoisemerge, opendiff, p4merge and araxis.

Out of these, I know that emerge and vimdiff are command-line only. Although it is not listed, emacs' ediff can also be used as a mergetool. http://stackoverflow.com/questions/1817370/using-ediff-as-git-mergetool

I personally find that graphical tools such as meld makes things much easier.

share|improve this answer
add comment

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.