Menu
I recently encountered a very weird behavior of subversion.
I just merged my local copy of a branch with a remote branch. Everything went smooth, but I've got 1 tree conflict (local delete, remote update).
Okay, thought I, modified the working copy appropriately and ran "svn resolve --accept=working -R .".
Subversion told that it has resolved my problems and "svn st" no longer showed any issues. So, I tried to commit, but svn told me that one of the inner folders (inside my conflicted one) was out of date and suggested to svn up, BUT it made the folder to be in conflict again!
What shall I do to get out of this visious circle?
722
To resolve a conflict do one of three things: Merge the conflicted text by hand (by examining and editing the conflict markers within the file). Copy one of the temporary files on top of the working file. Run svn revert FILENAME to throw away all of the local changes.
Since 1.6 version SVN recognizes a new kind of conflict, known as a "tree conflict". Such conflicts manifest at the level of directory structure, rather than file content. Situations now flagged as conflicts include deletions of locally modified files, and incoming edits to locally deleted files.
Other tree conflictsIf you want to keep the folder from the merge target, just mark the conflict as resolved. If you want to use the one in the merge source then you need to SVN delete the one in the target first and run the merge again. If you need anything more complicated then you have to resolve manually.
~/sandbox/jabira > svn resolve --accept=theirs-full testClient/ svn: warning: Tree conflicts can only be resolved to 'working' state; 'testClient' not resolved ~/sandbox/jabira > svn resolve --accept=working testClient/ Resolved conflicted state of 'testClient' Hope this help
151
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
