using git / svn and dealing with version no

[ub.ch]

Heya!

we are (still) using svn to manage our vbulletin instance.
So far so good and all works well, but the main pain in the a•• is the upgrading process!
SVN marks _all_ new files as conflicted, just because they have a different version number

PHP Code:

|[-]| # vBulletin 4.1.5 Patch Level 1 - Licence Number V**
|[+]| # vBulletin 4.2.1 - Licence Number V** 


How do you handle this?
We are planning on moving to git; but as far as I can see, the problem is still the same.
I just don't want to go through all files and clear the conflicts.

NB: some "core" files have been modified by us, I do know which ones, but the whole point of a versioning system is to know have to deal with those

Or am I doing the update process wrong then you or what is best practice?

Best