{"thread":{"id":"30007","subject":"git merge","startedAt":"2012-03-20T09:47:35Z","lastAt":"2012-03-20T23:50:01Z","messageCount":3,"participants":["Fabien Dubail","Neal Kreitzinger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"187313","messageId":"4F685237.5060402@labage.be","threadId":"30007","inReplyTo":null,"subject":"git merge","fromName":"Fabien Dubail","fromEmail":"fabien.dubail@labage.be","sentAt":"2012-03-20T09:47:35Z","receivedAt":"2012-03-20T09:47:35Z","isPatch":false,"sender":{"key":"fabien.dubail@labage.be","avatar":null},"body":"Hi,\n\nI've conflicts when I merge branches. I can resolve some conflicts but \nnot all. The remaining conflicts will be solved by someone else?\nTo do that I would like to merge only some files and resolve 'my' \nconflicts. (something like: 'git checkout branch files' but with merge)\nThan remaining files will be merged by someone else and remaining \nconflicts will be resolved .\nIs-it possible to do that with git and how? Or is there an other way?\n\nThanks\n\nFabien\n"},{"id":"187372","messageId":"4F69179C.3030808@gmail.com","threadId":"30007","inReplyTo":"4F685237.5060402@labage.be","subject":"Re: git merge","fromName":"Neal Kreitzinger","fromEmail":"nkreitzinger@gmail.com","sentAt":"2012-03-20T23:49:48Z","receivedAt":"2012-03-20T23:49:48Z","isPatch":false,"sender":{"key":"nkreitzinger@gmail.com","avatar":null},"body":"On 3/20/2012 4:47 AM, Fabien Dubail wrote:\n>\n> I've conflicts when I merge branches. I can resolve some conflicts but\n> not all. The remaining conflicts will be solved by someone else?\n> To do that I would like to merge only some files and resolve 'my'\n> conflicts. (something like: 'git checkout branch files' but with merge)\n> Than remaining files will be merged by someone else and remaining\n> conflicts will be resolved .\n> Is-it possible to do that with git and how? Or is there an other way?\n>\nOne way you can do it is to create a branch containing your resolutions. \n  Then the other person pulls your branch.  They would redo the merge on \ntheir own branch and checkout your resolutions to apply your work, and \nresolve the remainder himself.  This could go on for mutltiple people. \nYou can edit the merge commit message to document who resolved which \nconflicts.\n\nMaybe someone has a better way.  We did a \"distributed merge\" this way. \n  I pulled everyone else's branches containing their resolutions and \nthen redid the merge and checkout out their resolutions from their \nbranches and resolved my portion assigned to me personally.  Actually, I \nthink I did mine in a separate branch and then when all were done I \nredid the merge and checked out out everyone's portions from their \nrespective branches (including mine) to accomplish the distributed merge \n(merge conflict resolution).  (In our case, we were actually doing \ngit-rebase \"merge\", but I think it would work for git-merge also.)\n\nMaybe someone else has a better way.\n\nv/r,\nneal\n"},{"id":"187371","messageId":"4F6917A9.3000400@gmail.com","threadId":"30007","inReplyTo":"4F685237.5060402@labage.be","subject":"Re: git merge","fromName":"Neal Kreitzinger","fromEmail":"nkreitzinger@gmail.com","sentAt":"2012-03-20T23:50:01Z","receivedAt":"2012-03-20T23:50:01Z","isPatch":false,"sender":{"key":"nkreitzinger@gmail.com","avatar":null},"body":"On 3/20/2012 4:47 AM, Fabien Dubail wrote:\n>\n> I've conflicts when I merge branches. I can resolve some conflicts but\n> not all. The remaining conflicts will be solved by someone else?\n> To do that I would like to merge only some files and resolve 'my'\n> conflicts. (something like: 'git checkout branch files' but with merge)\n> Than remaining files will be merged by someone else and remaining\n> conflicts will be resolved .\n> Is-it possible to do that with git and how? Or is there an other way?\n>\nOne way you can do it is to create a branch containing your resolutions. \n  Then the other person pulls your branch.  They would redo the merge on \ntheir own branch and checkout your resolutions to apply your work, and \nresolve the remainder himself.  This could go on for mutltiple people. \nYou can edit the merge commit message to document who resolved which \nconflicts.\n\nMaybe someone has a better way.  We did a \"distributed merge\" this way. \n  I pulled everyone else's branches containing their resolutions and \nthen redid the merge and checkout out their resolutions from their \nbranches and resolved my portion assigned to me personally.  Actually, I \nthink I did mine in a separate branch and then when all were done I \nredid the merge and checked out out everyone's portions from their \nrespective branches (including mine) to accomplish the distributed merge \n(merge conflict resolution).  (In our case, we were actually doing \ngit-rebase \"merge\", but I think it would work for git-merge also.)\n\nMaybe someone else has a better way.\n\nv/r,\nneal\n"}]}