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

Minor rewording

Browse Source
This commit is contained in:
Jim Myhrberg
2017-08-25 13:15:31 +01:00
parent 0b2cde114a
commit 610d131dd5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common-flow.md
View File

@@ -82,10 +82,10 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119).
9. If there is a truly valid technical reason to not use rebase when
updating change branches, then you can update change branches via merge
instead of rebase. The decision to use merge MUST only be taken after all
possible options to use rebase have been tried and failed. For example,
people not understanding how to use rebase is NOT a valid reason to use
merge. If you do decide to use merge instead of rebase, you MUST NOT use
a mixture of both methods, pick one and stick to it.
possible options to use rebase have been tried and failed. People not
understanding how to use rebase is NOT a valid reason to use merge. If
you do decide to use merge instead of rebase, you MUST NOT use a mixture
of both methods, pick one and stick to it.
4. Pull Requests
1. To merge a change branch into its merge target, you MUST open a "pull
request" (or equivalent).