I am trying to merge a feature branch back to the trunk and I am getting
One or more files are in a conflicted state.
Conflicted
- C:\Projects\MyaPP\frmMain.vb
C:\Projects\MyaPP\frmMain.Designer.vb Conflicted
C:\Projects\MyaPP\Controls\frmView.Designer.vb
Here is a brief history on what happened.
From the trunk, a feature branch (Feature1) was created, in May 2011. From the trunk, a feature branch (Feature2) was created, in July 2011.
then last Friday, branches/Feature2 was merged back into the trunk successfully. Then today I attempted to merge branches/Feature1 I am getting the error above.
any advice on how I should handle this?
I haven't used VisualSVN but conflict resolution should be similar in all SVN clients. You should compare (or 'diff') the conflicted files (in TortoiseSVN its right click-> resolved... and then right click..compare on the items in the list). Scroll through the files and copy over to the working copy the lines from Feature1 you want to merge into the trunk. When you are satisfied, save & close and then mark the conflict as 'resolved'.
Hope you can extrapolate from this.