Jump to content

SVN Files As "Conflicted"


Prodigal Son
 Share

Recommended Posts

Merge conflicts only happen when you at one point patched your working copy, then updated it and the update changed the same files in the places you have edited. Than can include a leftover unrevisioned file.

If you want to preserve your diff, you have to carefully proofread it. If you weren't aware that there was a difference, you should revert your working copy regardless of the chosen merge resolve action. Should also look for unintentionally leftover unrevisioned files with the file "status" somewhere in tortoise.

  • Like 1
Link to comment
Share on other sites

6 minutes ago, elexis said:

Merge conflicts only happen when you at one point patched your working copy, then updated it and the update changed the same files in the places you have edited. Than can include a leftover unrevisioned file.

If you want to preserve your diff, you have to carefully proofread it. If you weren't aware that there was a difference, you should revert your working copy regardless of the chosen merge resolve action. Should also look for unintentionally leftover unrevisioned files with the file "status" somewhere in tortoise.

I'm kinda confused by the terms. Could you explain exactly what patched and (leftover) unrevisioned stand for in this case?

Link to comment
Share on other sites

Since there were merge conflicts, it means that at some point in history you most likely changed something in your directory.

If you don't care about that anymore, just do a revert and delete unrevisioned files.

https://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-revert.html

https://stackoverflow.com/questions/613485/how-can-i-get-tortoisesvn-to-get-a-list-of-files-that-are-not-in-the-repository

Link to comment
Share on other sites

@elexis Ty, makes sense now.

I guess it happened while modding (though that was in another folder) or working on patches/tickets a while back, but I don't remember messing with the specific files in conflict. What I can recall is something similar happening with mod versions from github, not from SVN. Those shouldn't affect the main game files/public mod either.

Link to comment
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

 Share

×
×
  • Create New...