SVN Files As "Conflicted"

[Prodigal Son]

I just updated my SVN version of the game after quite a while and got this warning:

Spoiler

What I could trace with a quick search was map related, a couple like this one:

Spoiler

Will those cause any issues and if so, what should I do?

 

 

Edited March 14, 2018 by Prodigal Son

[Lion.Kanzen]

Select the conflict or right click or searching in Tortoise menu...  put resolve from them using theirs

Here is.

Edited March 14, 2018 by Lion.Kanzen
image

[Prodigal Son]

Thanks, got it  

[Stan`]

That's a big update

[Prodigal Son]

12 minutes ago, stanislas69 said:

That's a big update

My previous version was aquired in 2016  

[elexis]

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.

[Prodigal Son]

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?

[elexis]

unrevisioned files = files that aren't marked as part of the repository. like a new template that someone wanted to add sometime but wasn't actually added but you still got the file around.

patched file = file that differs from what is in the repository

[elexis]

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

[Prodigal Son]

@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.