On Mon, Aug 11, 2014 at 4:29 PM, Chris Packham <judge.packham@xxxxxxxxx> wrote: >> So, the "recording" phase may go something like this: >> ... >> git checkout merge-fix/$this-$that >> git read-tree -m -u HEAD $this >> git commit -a -m 'merge-fix/$this-$that postimage' >> >> The rough idea is "git show merge-fix/$this-$that" will show the >> "patch" you can apply on top of the conflicted state other people >> would get by running "git merge $that" while on "$this" branch. > > So how would someone else pickup that postimage and use it? > > git checkout $this > git merge $that > git fetch $remote ':/merge-fix/$this-$that postimage' > git show ':/merge-fix/$this-$that postimage' | git apply (or patch -p1) For a simpler case that would work, but because we are not saving just a patch but two full trees to compare (i.e. merge-fix/$this-$that is the postimage, its ^1 is the preimage), you should be able to use the three-way merge in a similar way cherry-pick works. In fact, that is how rerere replays the recorded resolution, not with a "patch -p1". -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html