How to backport a change

Jump to bottom Edit New page

Clemens Brunner edited this page Nov 14, 2020 · 4 revisions

Squash and merge the PR on GitHub
Update local master: git fetch upstream followed by git rebase upstream/master
Locally check out maint/0.21 up to date and tracking upstream branch: git checkout -t upstream/maint/0.21
Cherry pick the squashed commit; if it is the latest commit on master this would be git cherry-pick master
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/0.21)
Manually copy-paste the change log line to 0.21.inc
git add doc/changes/0.21.inc
git cherry pick --continue
Accept the log message
git push
Done &ndash the message box on GitHub regarding changes to the maint/0.21 branch will disappear after a while