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
binary files.
> 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-o
Martin Langhoff <[EMAIL PROTECTED]> writes:
> Is there a way to replay a merge on a head that GIT considers unrelated?
>
> I have been playing with exporting to mbox format with
> git-format-patch-script, and applying those to the destination branch.
> However, this drops binary files -- and I _d
2 matches
Mail list logo
