jimeh/common-flow
1
0
Fork 0
mirror of https://github.com/jimeh/common-flow.git synced 2026-02-19 01:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow updating change branches via rebase or merge

Browse Source 
Allow for pulling in changes from the source branch either via
rabasing or merging, instead of only allowing rebasing. Rebasing is
still recommended however.
This commit is contained in:
Jim Myhrberg
2017-08-08 21:15:00 +01:00
parent 5cecf7dd84
commit 4fd8d2f639
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common-flow.md
View File

@@ -72,11 +72,17 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119).
needs a designated "merge target" branch, typically this will be the same needs a designated "merge target" branch, typically this will be the same
as the source branch. as the source branch.
7. Change branches MUST be regularly updated with any changes from their 7. Change branches MUST be regularly updated with any changes from their
source branch. This MUST be done by rebasing the change branch on top of source branch. It is RECOMMENDED this update is done by rebasing the
the source branch. change branch on top of the source branch. Alternatively it can be done
8. After rebasing a change branch on top of its source branch you MUST push by merging the source branch into the change branch.
the change branch to the remote server. This will require you to do a 8. You MUST NOT use a mixture of rebase and merge to update change branches
force push, and you SHOULD use the "--force-with-lease" git push option. from their source branch. Pick one method for the project and/or team,
and stick to it.
9. After updating a change branch from its source branch you MUST push the
change branch to the remote server. If you updated the change branch via
rebasing, you will be required to do a force push, and you MUST use the
"--force-with-lease" git push option when doing so instead of the regular
"--force".
4. Pull Requests 4. Pull Requests
1. To merge a change branch into its merge target, you MUST open a "pull 1. To merge a change branch into its merge target, you MUST open a "pull
request" (or equivalent). request" (or equivalent).