Versions Compared

Key

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

...

  1. Make a backport of the first change. The pull request gets numbered <ID>, and a branch pr/<ID> is created.
  2. Backport the second change on top of branch pr/<ID>. In the second pull request, compare against this branch.

     (Note: If you fetch branch pr/<ID> from to backport the second change on top of, make sure you rename it before opening the pull request, otherwise the Skara bot will complain that a branch with the same name is present in the target repository and suggest that you close the PR and open a new one after renaming the branch).

After pushing the first pull request, the second will be retargeted to master. See also the description in this Mail.

...