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:
svn -r 71:HEAD Menu.cpp
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:
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?