On 1/19/06, Petr Baudis <pasky@suse.cz> wrote: > Now you want to merge the branch as a whole. Cherrypicking-aware VCS > would just merge the patch2, but you are taking the whole diff: ... > And you get a conflict instead of b\nc. While I haven't tested your particular example, it looks to me like git-cherry would identify it correctly. So far my experience has been that git-cherry's strategy detects my cherry-picked patches pretty well. Why would it not work in your example? Patch 1 has clearly been applied in both branches, and git-cherry would normally detect that alright. btw, when is cg-merge switching to use git-merge? :-p martin - 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 Thu Jan 19 06:08:03 2006
This archive was generated by hypermail 2.1.8 : 2006-01-19 06:08:12 EST