Tree conflicts on files that have not been changed

Issue #613 closed
Pavel Potcheptsov
created an issue

Got feedback from my colleague:

I am working on merging a branch into the trunk,
first I have merged the trunk into the branch,
and committed that.
But when I then try to merge the branch back to the trunk I get an error:
tree conflicts on files that have not been changed,
and some of them which have only been changed in the trunk.

Trying to merge the following branch:
http://scm.domain.com/scm/svn/repo/trunk/DCDC/branches/1_testload_on_at_startup
into the trunk:
http://scm.domain.com/scm/svn/repo/trunk/DCDC/trunk
I right click on trunk and select merge under tortoisesvn,
select merge revision range,
select branch in URL to merge from,
select all revision,
select to ignore whitespace changes,
and make a test merge.

Comments (3)

  1. Log in to comment