sometimes when merge-ing fast forward doesn't work. but you know what the=20
resolution you want is.

example (current behavior)
Normal merge conflict for 'css/main.css':
  {local}: modified
  {remote}: modified
Hit return to start merge resolution tool (vimdiff):

but I don't want to. I know the remote updates are right. I could do a git=
=20
checkout remotebranch filename but when you have 20 files that need updatin=
g=20
this is annoying

my suggestion is this
Normal merge conflict for 'css/main.css':
  {local}: modified
  {remote}: modified
Use (l)local or (r)remote or (m)anual?=20

also in the event of having 20 files with this issue it would be nice to ha=
ve=20
an option after first starting mergetool for remote all or local all.

(note: I am not subscribed to the list)
=2D-=20
Caleb Cushing

my blog http://xenoterracide.blogspot.com