Menu
When firing the SVN update statement I am getting the conflicts. How can I keep my version and check that in. What is the command for that?
268
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.
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.
If you're using a shell client like TortoiseSVN, then right click "resolve using mine" as @Adi mentions.
On the command line, it's
svn resolve --accept mine-full <FILENAME>
If you are working in the command line instead of using a UI, svn will ask you when you do "svn update" something like:
Conflict discovered in 'bar.c': (p) Postpone (e) Edit (tf) Theirs-full (mf) Mine-full
What you want is mine-full (mf). Of course this will overwrite any changes that the other person made, so you may instead want to (e)dit.
If you choose to (p)ostpone this, you will need to change the file later and mark it as resolved (svn resolved ), followed by a svn commit.
28
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
