what was not supposed to happen happened to me today. We worked on the feature branch in svn (Server afaik 1.6, client 1.7). Yesterday this thread was reintegrated, and I was not in the office. Now I have some local changes left in my working copy, pointing to an already reintegrated branch. Of course, it's partly my fault to leave the changes locally after work, but that's a different story; -)
I know that reintegrating a branch is again not an option, so what
are the best ways to bring my changes to the trunk? A colleague suggested using patches that I had never used before. I also thought about how the cherry collected my changes after I sent them to the branch, but I'm not sure if this will work. Are there any other options?
Any help is greatly appreciated.
Regards Nico
source
share