{"thread":{"id":"11068","subject":"Re: can't commit files that have been git add'ed because \"fatal: you need to resolve your current index first\"","startedAt":"2007-11-30T16:32:17Z","lastAt":"2007-11-30T16:32:17Z","messageCount":1,"participants":["Bill Priest"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"61511","messageId":"379331.84167.qm@web55014.mail.re4.yahoo.com","threadId":"11068","inReplyTo":null,"subject":"Re: can't commit files that have been git add'ed because \"fatal: you need to resolve your current index first\"","fromName":"Bill Priest","fromEmail":"priestwilliaml@yahoo.com","sentAt":"2007-11-30T16:32:17Z","receivedAt":"2007-11-30T16:32:17Z","isPatch":false,"sender":{"key":"priestwilliaml@yahoo.com","avatar":null},"body":"On Wed, 28 Nov 2007 12:08:40 -0800\nJunio C Hamano <gitster@pobox.com> wrote:\n\n> You can still do that by hand, by doing something\nlike:\n> \n> \t$ git merge --squash A\n>         $ resolve only partly\n>         $ git commit -m 'Prepare to merge A'\n>         $ git reset --hard\n>         $ git merge A\n> \t$ resolve the rest\n>         $ git commit -m 'Fully merged A'\n> \n> For such a multi-step merge to make sense, the\nchange between B---M\n> should make sense by itself for people who have to\nread such a history\n> later.  Such a half-a-squash-merge may probably not\nmake sense by itself\n> in most cases, so I suspect the above workflow would\nnot be useful in\n> general.\n> \n\nJunio,\n\tI resolved all the merges and then committed\ndifferent files as groups to make it easy to\ncherry-pick after this merge.  Does this \"mess up\" the\nmerge info?  What does the \"git reset --hard\" do after\nthe commit (I'm assuming it throws away the\nnon-resolved changes not committed)?  But from my\nexperience git wouldn't let me do the commit above it\nw/o first fixing the conflicts.\n\n\tAm I mis-interpreting your example or are you saying\nthat you think git would let me do the commit w/o\nresolving all conflicts?\n\nBill\n\n\n\n      ____________________________________________________________________________________\nGet easy, one-click access to your favorites. \nMake Yahoo! your homepage.\nhttp://www.yahoo.com/r/hs \n"}]}