Updating modified DarkRP

I have a modified DarkRP server, but I can’t figure out how to update DarkRP and keep my modifications.
Most of my modified lua files don’t have any issues,
but my version of shared.lua uses the old language system (ex: LAGUAGE.cophelp) however the updated version uses a different one, and I can’t figure out how to merge the two shared.lua files.
Yes, I have tried this, but when I go to TortoiseSVN > Resolve… nothing shows up in the window.
Sorry that I’m not very good with SVN.

What do you mean by empty?

Nothing shows up in the list.
Anyway I figureed out how to get the files open in tortoise merge, so I did it manually.