How to backport a change - mne-tools/mne-python GitHub Wiki

  1. Squash and merge the PR on GitHub
  2. Update local main: git fetch upstream followed by git rebase upstream/main
  3. Locally check out maint/1.0 up to date and tracking upstream branch: git checkout -t upstream/maint/0.22
  4. Cherry pick the squashed commit; if it is the latest commit on main this would be git cherry-pick main
  5. 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)
  6. Manually copy-paste the change log line to 1.0.inc (make a new section header for the next bugfix release if necessary)
  7. git add doc/changes/1.0.inc
  8. git cherry-pick --continue
  9. Accept the log message
  10. git push (or if you are not comfortable pushing directly to upstream, consider making a PR instead)
  11. Done – the message box on GitHub regarding changes to the maint/1.0 branch will disappear after a while