Ralph Goers wrote:
I am trying to merge changes I have made on BRANCH_2_1_X with trunk. What is the best way to do that?I guess I should be more specific. I tried following the instructions in the "fast introduction" but I end up with no changes in the file.
