SVN does not check branch changes

Question

SVN does not check branch changes

Navigation

#1 by (2 votes)

2

I created a branch from the trunk, and made all the necessary changes. When I finalized the changes, using Visual Studio 2015 I merged the branch with the trunk.

I was resolving conflicts when I made a mistake in choosing one of them. I made the revert in the solution to merge everything again, however, this time Visual Studio or SVN itself does not "find" any pending commits, it's like I've been merging everything.

When I open the branch, I have my changes, when I open the trunk, I do not have the changes, if I merge the branch with the trunk, there is nothing pending.

versionamento svn visual-studio

asked by anonymous 23.08.2017 / 20:47

1 answer

Change task time in Windows OpenBDT - Test Automation Framework

score 2 · Accepted Answer

What you can do is a manual merge if your SVN has given a bug.

First, try to clean up the trunk and branch in question.

If the problem persists, make a copy of the branch and paste it into the trunk, and the effect will be the same, you can edit the conflicts in the commit.