Maintaining Stable Branch
How to deal with merging PR and maintain a stable branch
In order to maintain a stable branch it is required to follow a process on every PR that gets merged to ensure they are back ported.
Provided the criteria are met:
- 1.Merge the PR to master generating a merge commit.
- 2.i.e. "Merge pull request #5797 from AvaloniaUI/double-tapped-event-args"
At this point the git tree should look similar to this.
Now we need to get the new PR merged into the stable branch.
- Checkout the
- Cherrypick the merge commit from master.
The git tree should look like this now.
Please also use the
backported 0.10.xlabels on the PRs themselves.