File tree Expand file tree Collapse file tree 1 file changed +10
-1
lines changed Expand file tree Collapse file tree 1 file changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -397,7 +397,16 @@ Porting changes across branches:
397
397
git commit -sam"Backport from N to M"
398
398
# Open pull request
399
399
# Do not squash, rebase instead
400
- * Periodically, a maintainer will ** forward-port** changes to newer release
400
+
401
+ Alternatively, you can use ` mergify ` to create backports. Go to the original
402
+ pull request and add a comment:
403
+
404
+ @mergifyio backport gz-<library>M
405
+
406
+ where ` M ` is the version to backport to.
407
+
408
+ * In certain cases when a pull request is merged into an older release branch,
409
+ a maintainer will ** forward-port** changes to newer release
401
410
branches all the way up to ` main ` .
402
411
* See [ this list] ( https://github.com/gazebosim/docs/blob/master/tools/branch_comparisons.md ) to check if a branch needs porting.
403
412
* The merge forward can be done with ` git merge ` in order to keep the commit history
You can’t perform that action at this time.
0 commit comments