CONTRIBUTING.md: fix typo
Change-Id: Id18341b27bb9509e2b0a0c19ebc998878766818c
This commit is contained in:
parent
dfd01fae98
commit
48b3c0a3f8
|
@ -113,8 +113,8 @@ changes A, B and C on a single branch:
|
||||||
…
|
…
|
||||||
|
|
||||||
... and submit all three using a single `git push origin HEAD:refs/for/main`. Gerrit will create a review
|
... and submit all three using a single `git push origin HEAD:refs/for/main`. Gerrit will create a review
|
||||||
.request for A, B and C, and it understands the relation chain between them. C can only be merged after B and
|
request for A, B and C, and it understands the relation chain between them. C can only be merged after B and
|
||||||
.C, and merging C will automatically merge B and C as well.
|
C, and merging C will automatically merge B and C as well.
|
||||||
|
|
||||||
This means that A can be reviewed, approved and merged before B and C are done. Other team members can then
|
This means that A can be reviewed, approved and merged before B and C are done. Other team members can then
|
||||||
start building on A and avoid a "big scary merge". This workflow is often called **trunk-based development**.
|
start building on A and avoid a "big scary merge". This workflow is often called **trunk-based development**.
|
||||||
|
|
Loading…
Reference in New Issue