Message view | « Date » · « Thread » |
---|---|
Top | « Date » · « Thread » |
From | Daniel Shahaf <...@daniel.shahaf.name> |
Subject | Re: How to merge a rename of a folder |
Date | Thu, 11 Oct 2012 00:59:51 GMT |
Stefan Sperling wrote on Wed, Oct 10, 2012 at 22:14:49 +0200: > On Tue, Oct 09, 2012 at 09:10:41PM +0200, Martin Bischoff wrote: > > Instead of merging revision N and resolving the conflicts, would a > > record-only merge of revision N give the same result? > > Yes, except that record-only merges will update all subtree > mergeinfo within the merge target, if any exists. ... which matters if rN contained changes other than renaming a directory. | |
Mime |
|
View raw message |