Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Info
titleUseful Information

After a merge from the trunk into your branch, you should record the end revision of the trunk (i.e. the HEAD revision at the time of the merge). Let's call this revision r1. r1 becomes the ancestor in subsequent future merges!

Checklist

Now that we have the fundamentals down, let's cover the actual checklist.

...