Agreed on the impossibility of 3-way merges with binary files. In the
branch I want to replay, though, I have commits that add and change
> About 'unrelated' trees, if you know of a good tree you can use
> $ git-read-tree -m -u c master b
> $ git-merge-cache -o git-merge-one-file-script -a
> If the resulting tree looks reasonable, you could now commit it
> telling 'git-commit-tree' that the parents of the new commit are
> master and b, and you practically merged two projects.
Cool! I think this is what I was looking for. The call to
git-read-tree will act as if A and B had branched off at tree "C".
I'll have to read the doco on git-read-tree and git-merge-cache a bit
more to feel comfortable with this voodoo, but it's great.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html