{"thread":{"id":"2989","subject":"manual merge/fixup question","startedAt":"2006-01-07T16:55:06Z","lastAt":"2006-01-07T17:01:32Z","messageCount":2,"participants":["Luben Tuikov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"14248","messageId":"20060107165506.67640.qmail@web31812.mail.mud.yahoo.com","threadId":"2989","inReplyTo":null,"subject":"manual merge/fixup question","fromName":"Luben Tuikov","fromEmail":"ltuikov@yahoo.com","sentAt":"2006-01-07T16:55:06Z","receivedAt":"2006-01-07T16:55:06Z","isPatch":false,"sender":{"key":"ltuikov@yahoo.com","avatar":null},"body":"git resolve or git merge fails, complaining\nabout file(s) having conflicts. I go ahead and fix up\nthose files and then update the index.\n\nCan I assume now that I can go ahead and do git commit,\nor is there any more/other files which need fixing?\n\nI.e. does git resolve/merge fail on the first file\nwhich needs fixing or would it go through all of them,\nand then report the ones which need fixing?\n\nThanks,\n   Luben\n"},{"id":"14249","messageId":"20060107170132.66682.qmail@web31803.mail.mud.yahoo.com","threadId":"2989","inReplyTo":"20060107165506.67640.qmail@web31812.mail.mud.yahoo.com","subject":"Re: manual merge/fixup question","fromName":"Luben Tuikov","fromEmail":"ltuikov@yahoo.com","sentAt":"2006-01-07T17:01:32Z","receivedAt":"2006-01-07T17:01:32Z","isPatch":false,"sender":{"key":"ltuikov@yahoo.com","avatar":null},"body":"Ok, I think it does all of them...\n    Luben\n\n--- Luben Tuikov <ltuikov@yahoo.com> wrote:\n\n> git resolve or git merge fails, complaining\n> about file(s) having conflicts. I go ahead and fix up\n> those files and then update the index.\n> \n> Can I assume now that I can go ahead and do git commit,\n> or is there any more/other files which need fixing?\n> \n> I.e. does git resolve/merge fail on the first file\n> which needs fixing or would it go through all of them,\n> and then report the ones which need fixing?\n> \n> Thanks,\n>    Luben\n> \n> -\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n> \n"}]}