How to backport a change

Jump to bottom Edit New page

Clemens Brunner edited this page May 17, 2022 · 4 revisions

Squash and merge the PR on GitHub
Update local main: git fetch upstream followed by git rebase upstream/main
Locally check out maint/1.0 up to date and tracking upstream branch: git checkout -t upstream/maint/0.22
Cherry pick the squashed commit; if it is the latest commit on main this would be git cherry-pick main
git mergetool to deal with the deleted file and any conflicts (usually just means hit "d" to delete latest.inc that doesn't exist on maint/1.0)
Manually copy-paste the change log line to 1.0.inc (make a new section header for the next bugfix release if necessary)
git add doc/changes/1.0.inc
git cherry-pick --continue
Accept the log message
git push (or if you are not comfortable pushing directly to upstream, consider making a PR instead)
Done – the message box on GitHub regarding changes to the maint/1.0 branch will disappear after a while