We are currently using SVN (CollabSVN Server install 1.5.x) and
We are using the Trunk for our main development line, and have a
branch (release-1.0) which is being used to perform hot fixes, patches
and minor functionality improvements.
When a change is made to the release branch we merge in the changes
from the release to the trunk. In many cases the code on the trunk has
changed sufficiently to cause a conflict. When we resolve the
conflict (using the "edit conflicts" option and then saving) and
commit, everything seems fine. However, when we come to reintegrate
the release branch again sometimes files which have already been
reintegrated are flagged to be reintegrated again. Even if that file
on the branch has not been changed since that last reintegration.
Some scenario testing has shown that this happens when you do not
select "use theirs" for every conflict between the trunk and release.
So your not taking the branches version for each and every conflict in
Is this expected behaviour? I assumed that we should be able to
select code from either the trunk or the branch when resolving, and
then selecting "Resolved" should be enough. It doesn't seem to be the
case though. If you then commit this file, and then go through the
process of reintegrating the branch the file will again be marked for
reintegration and also be marked as a conflict.
Any suggestions, are we using it wrong? Not selecting the correct
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-20 17:05:34 CET