ansaurus

Question

Answer 1

A:

This isn't exactly what you're looking for, but git stash is very helpful for resolving merges. Just do:

git stash create
git pull
git stash pop <stashnum>

Where <stashnum> is the output from git stash create

adam_0 2009-11-29 19:45:50

i use git stash a lot, thanks.is there a simple way to know which files will be updated in the next 'git pull' ?

arod 2010-02-17 22:29:43

`git status` should show you what will be updated.

adam_0 2010-02-18 05:22:37

Answer 2

A:

If you're on OS X, I'd recommend FileMerge. It has a great interface and is quite handy.

git config --global merge.tool opendiff

Then, whenever you have a merge conflict, just run

git mergetool

Dan Loewenherz 2009-12-03 06:29:20

console UI tool for resolving merge conflicts in git... like vimdiff but 'easier'