Len Brown wrote: > Sometimes when a multiple-file merge give conflicts, I don't want to edit > one of the resulting <<<<<=====>>>>> files. > Instead, I just want to choose the version of that particular file that > existed in one of the two merged branches and commit that along with > the rest of the merge. > > How to do this? $ git cat-file -p :<n>:<filename> > <filename> $ git update-index <filename> where <n> is one of stages, 1 or 2 to choose one branch version if I remember correctly. Check out documentation. Or just use 'ours' as merge strategy... -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Tue Oct 31 07:24:52 2006
This archive was generated by hypermail 2.1.8 : 2006-10-31 07:25:59 EST