On 07/15/2010 05:40 AM, Biddiscombe, John A. wrote: > After doing a merge, I get * * literally thousands * * of errors when I try to commit my local branch What is the output of...? $ git branch $ git status $ git rev-parse HEAD -Brad