subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Benjamin Fritz <fritzophre...@gmail.com>
Subject Re: Directory with tree conflict lies about merge result
Date Wed, 06 Aug 2014 17:21:39 GMT
On Wed, Aug 6, 2014 at 12:14 PM, Andreas Stieger <andreas.stieger@gmx.de> wrote:
> Hello,
>
> I recommend the following:
> In a clean working copy of the feature branch...
> svn mv host host_branch
> Then perform the merge, now without tree conflict.
> svn mv host_branch/test host/
> svn rm host_branch
>

Thanks! That got me around my immediate problem.

But why does "svn merge" output misleading status, saying that it
added files and folders that never actually get added to the working
copy?

Mime
View raw message