On 10/20/05, Martin Langhoff <martin.langhoff@gmail.com> wrote: > After using git-merge a few times by hand to test-drive the new merge > drivers, I'm sold on the idea, and I 'd like to have cg-merge use > git-merge directly. I started drafting a 5-minute proof-of-concept, and then it struck me: cg users aren't aware of the index. This is really important when you are merging and have to resolve a conflict over a dirty tree. git users know that the "clean" part of the merge is in the index, and they have to resolve a couple of files in their checkout, and update the index for those only before calling git-write-tree & git-commit-tree. Cogito users don't know about this magic at all, which is a bit of a problem. I can refuse to run cg-merge on a dirty tree to make things simpler, but that's cheating ;-) tagging "for later"... cheers, 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 Oct 20 17:05:27 2005
This archive was generated by hypermail 2.1.8 : 2005-10-20 17:05:30 EST