Re: file obstruction upon merging an already merged added/moved file (#4649)
Julian Foad wrote:
> On 06/09/16, Stefan Hett wrote:
>> What still is unclear to me is that SVN handles the case when I do an
>> auto merge but not when using the cherry pick merge. [...]
> An auto merge doesn't try to merge back a revision that it can determine
> has already been applied to the target branch.
>> Maybe it's best to have a quick look at this at Berlin, if time permits?
> Sorry, I can't come to Berlin this year [...]
but I'm sure someone else will be glad to go through it with you.
Received on 2016-09-10 10:35:55 CEST
This is an archived mail posted to the Subversion Dev