I am using TSVN Gui on windows, and I've got a local copy of the trunk.
I click on merge and select the branch I want to merge ...
But I am facing conflicts or files Local or repository version is okay after the conflict is resolved ...
It leads me to believe that I am merging this backwards.
So I tried to start from the branch and merged (reintegrate) and lifted the trunk from the repo.
None of these are working well.
Any thoughts?
You can merge all the changes from the trunk to the branch before merging it back into the trunk Are there.
Comments
Post a Comment