Menu
I've been unfortunate enough to run into a lot of tree conflicts with myself lately on this project I'm working on. I want to know what is the best and simplest way to resolve a tree conflict if I want to keep my local changes only. Thank you.
415
asked Mar 18 '13 14:03
When you merge your branch back into the trunk, SVN tries to do the same again: It sees that a file was created in your branch, and tries to create it in your trunk in the merge commit, but it already exists! This creates a tree conflict. The way to avoid this, is to do a special merge, a reintegration.
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.
Right-click on file > Edit Conflicts > Mark as Resolved.
140
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
