subversion merge :-\
 

Hello,
I'm working with subversion for my project(Combat of Death), and I've made some changes to Menu.cpp but some other guy too, and he commited it faster than me.
So when i tried to commit I got a conflict with Menu.cpp(you know, the C before Menu.cpp).
So I thought, let's merge his shit in Menu.cpp using the merge thing from subversion.
So I did:
I probably did some similiar things a couple of times, because my file is no 2600 lines, and it orignally was about 600 lines(it's repeated a lotta times).
But now I've gotta find the right one, because I also merged with version 69.
I now have lines like:
and
In my file, So how do I know where to where I have to cut the code, so I don't lose my code at which I worked(debugt) so long?
Thanx Hylke

i'm not familiar with subversion doing merge in that fashion, only using merge to 'revert,' if you will.

i think a good route to go would be to run a 'diff' on version 70 and your working copy and then apply that patch to version 71 (this other guy's work). there might be some conflicts to manually resolve, (my guess is that there quite likely will be), but it shouldn't be too bad unless you and he made large quantities of changes.

Ok thanx.
(although I hoped for an easier solution)
Hylke