From: Bill Priest <priestwilliaml@yahoo.com>
Date: Wed, 28 Nov 2007 15:48:27 GMT
Subject: can't commit files that have been git add'ed because "fatal: you need to resolve your current index first"
Message-ID: <820179.5481.qm@web55002.mail.re4.yahoo.com>

All,
  I merged from one branch to another and had lots of
conflicts.  I've resolved a set of files from the
conflicts (in a directory) and did a git-add on this
set of files.  I wasn't able to commit these files. 
On IRC I was told that all files must be resolved
before I can commit any of them.  This seems pretty
limiting.  Why is a commit after a merge all or
nothing; I thought that git  figured out merges and
such by the differences between files??

Bill



      ____________________________________________________________________________________
Be a better sports nut!  Let your teams follow you 
with Yahoo Mobile. Try it now.  http://mobile.yahoo.com/sports;_ylt=At9_qDKvtAbMuh1G1SQtBI7ntAcJ