Skip to content

Commit 4724943

Browse files
committed
add mergify instruction, update forward port instruction
Signed-off-by: Ian Chen <[email protected]>
1 parent 54b7dcb commit 4724943

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

contributing.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,16 @@ Porting changes across branches:
397397
git commit -sam"Backport from N to M"
398398
# Open pull request
399399
# 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
401410
branches all the way up to `main`.
402411
* See [this list](https://github.com/gazebosim/docs/blob/master/tools/branch_comparisons.md) to check if a branch needs porting.
403412
* The merge forward can be done with `git merge` in order to keep the commit history

0 commit comments

Comments
 (0)