Git Command Line Tools – Command Line Merge Conflict Tools

command linegitversion control

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?

Best Answer

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. https://stackoverflow.com/questions/1817370/using-ediff-as-git-mergetool

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

Related Solutions

Input to program without command-line arguments

You can use tools to display all the hardcoded strings inside the application, and hopefully the filename will show up.

Check OllyDBG on Windows and strings on Linux (it's a cmd-line application).

A more complex solution: fire up your favorite asm debugger (OllyDBG, GDB) and get your hands dirty.

Git – How to Do a Git Merge Entirely Remotely

It's kinda in the nature of a DVCS that the action happens on a local machine, and gets pushed back to the main repo.

If it's that onerous, script it.

#!/bin/bash

if [ ! -f ".git" ]
then
  echo "Not in a git repo!" >&2
  exit 1
else 
  git checkout stable && \
  git pull origin stable && \
  git merge work && \
  git push origin stable
fi

Best Answer

Related Solutions

Input to program without command-line arguments

Git – How to Do a Git Merge Entirely Remotely

Related Topic