ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Make pull-request sentence less ambiguous (#21802)

Browse source
This commit is contained in:
Daniel 2017-02-23 01:52:41 +00:00 committed by scottb
parent 9d2d364a38
commit d18bb96e88
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/docsite/rst/community.rst
View file

@ -154,7 +154,7 @@ In order to keep the history clean and better audit incoming code, we will requi
contain merge commits. Use ``git pull --rebase`` (rather than ``git pull``) and ``git rebase`` (rather than ``git merge``). Also be sure to use topic contain merge commits. Use ``git pull --rebase`` (rather than ``git pull``) and ``git rebase`` (rather than ``git merge``). Also be sure to use topic
branches to keep your additions on different branches, such that they won't pick up stray commits later. branches to keep your additions on different branches, such that they won't pick up stray commits later.
If you make a mistake you do not need to close your PR, create a clean branch locally and then push to GitHub If you make a mistake you do not need to close your PR. Instead, create a clean branch locally and then push to GitHub
with ``--force`` to overwrite the existing branch (permissible in this case as no one else should be using that with ``--force`` to overwrite the existing branch (permissible in this case as no one else should be using that
branch as reference). Code comments won't be lost, they just won't be attached to the existing branch. branch as reference). Code comments won't be lost, they just won't be attached to the existing branch.