From 7eb10eb1f468a6b01552d71548b01786a9a537dd Mon Sep 17 00:00:00 2001 From: Steven Kabbes Date: Wed, 18 May 2022 08:23:44 -0700 Subject: [PATCH] contributing: clarify preference for rebase Originally clarified by @deadprogram https://github.com/tinygo-org/tinygo/pull/2854 --- content/docs/guides/contributing/_index.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/content/docs/guides/contributing/_index.md b/content/docs/guides/contributing/_index.md index ce497517..3f15640b 100644 --- a/content/docs/guides/contributing/_index.md +++ b/content/docs/guides/contributing/_index.md @@ -48,6 +48,16 @@ Here is how to contribute back some code or documentation: - Submit a pull request against the `dev` branch. - Be kind +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: + +``` +git checkout dev +git pull --rebase origin dev +git checkout my-feature-branch +git rebase dev +git push myfork my-feature-branch -f +``` + ## How to run tests To run the tests: