Hi, I recently finished reading The Pragmatic Guide to Subversion, it was very helpful! I’m a little confused about the merging section though, and I was hoping someone could help.
Task 27 talks about rebasing a branch by reintegrating changes from the trunk into the feature branch. I was under the impression that reintegrating a branch makes it unusable for further work; wouldn’t this technique render the trunk unusable? Furthermore, it seems to be accomplishing the same thing that is described in Task 26, where changes are merged from the trunk into the branch. Which is the proper technique for updating a branch with trunk changes?