How can I reintegrate an already reintegrated and rolled-back branch in SVN?
-
30-10-2019 - |
سؤال
We did following ugly thing:
So, how can we achieve another reintegrate
?
What did I try so far?
- well, the obvious merge - which fails brutally!
- creating a patch and apply it to
trunk
(which should work, as it diffs the files with no svn only...) - creating another branch @ trunk r101 and merge all the changes from first branch - fails brutally :)
edit:
merge-infos for trunk do not show any merged revisions of the desired branch (as I've rolled them back with r101)
لا يوجد حل صحيح
لا تنتمي إلى StackOverflow