Re: Help with constant conflicts

On May 13, 2011, at 13:41 , K.L. wrote:

> Hi,
>
> Having problems with merge.

[...]

> me_at_localhost /srv/www/svnbugs/branches/branch1 $ svn merge
> svn+ssh://example.com/var/svn/svnbugs/trunk
> --- Merging r4 through r5 into '.':
> A dir2

[...]

> me_at_localhost /srv/www/svnbugs/trunk $ svn merge
> svn+ssh://example.com/var/svn/svnbugs/branches/branch1
> --- Merging r4 through r7 into '.':
> C dir2
> A dir3
> Summary of conflicts:
> Tree conflicts: 1
> me_at_localhost /srv/www/svnbugs/trunk $ svn st
> M .
> C dir2
>> local add, incoming add upon merge
> A + dir3

[...]

> Is it a bug or we issue wrong commands?
>

The second merge was wrong. To merge branch1 changes back to
the trunk, use 'merge --reintegrate ^/branches/branch1'.

See the section "Reintegrating a branch" in the SVN Book:

  http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate

Regards,
Steve

--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194