Michael Gerz wrote:
Abdel, what is your approach? We really have to make sure that our
branch experiment does not end in a massacre!
I use TortoiseSVN merging capability:
1) In the trunk revision history I select the oldest non merged commit
and those upward. But I stop my slection before a revision that I feel
is problematic.
2) I merge the selected commits. This is "Merge step 1"
3) I select again a new set of commits starting from the problematic one
and upward until I encounter another one that might be problematic.
4) I merge the selected commits and fix manually any conflict. This is
"Merge step 2"
5) goto 2
It worked pretty well up until now.
Abdel.
that a commit to th
Michael
