Skip to content

Commit 8798a02

Browse files
skabbesdeadprogram
authored andcommitted
contributing: clarify preference for rebase
Originally clarified by @deadprogram tinygo-org/tinygo#2854
1 parent 59227d4 commit 8798a02

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

content/docs/guides/contributing/_index.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,16 @@ Here is how to contribute back some code or documentation:
4848
- Submit a pull request against the `dev` branch.
4949
- Be kind
5050

51+
Please rebase (not merge) from the dev branch if your PR needs to incorporate changes that occured after your feature branch was created. You can accomplish that via the git command line:
52+
53+
```
54+
git checkout dev
55+
git pull --rebase origin dev
56+
git checkout my-feature-branch
57+
git rebase dev
58+
git push myfork my-feature-branch -f
59+
```
60+
5161
## How to run tests
5262

5363
To run the tests:

0 commit comments

Comments
 (0)