diff options
| author | Kelly Hogan <khogan974@gmail.com> | 2018-05-02 10:00:21 -0400 |
|---|---|---|
| committer | John R Barker <john@johnrbarker.com> | 2018-05-02 15:00:21 +0100 |
| commit | 2dc746bcc3b4bb3718239504c9427421a1656b94 (patch) | |
| tree | e887659a2d75534041b10fa83c643e0a06b9c934 /CODING_GUIDELINES.md | |
| parent | eb5e15e7e0dc60d53aea6370d9a45a47e3632b2e (diff) | |
| download | ansible-2dc746bcc3b4bb3718239504c9427421a1656b94.tar.gz | |
fixes #39585 typo fix under git practices (#39604)
Diffstat (limited to 'CODING_GUIDELINES.md')
| -rw-r--r-- | CODING_GUIDELINES.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CODING_GUIDELINES.md b/CODING_GUIDELINES.md index 682b3fe7a1..4c3335b21e 100644 --- a/CODING_GUIDELINES.md +++ b/CODING_GUIDELINES.md @@ -290,9 +290,9 @@ In particular, metaclasses are probably not appropriate, however entertaining th Git Practices ============= -Pull requests cannot be accepted that contain merge commits. +Pull requests cannot be accepted if they contain merge commits. -Always do "git pull --rebase" and "git rebase" vs "git pull" or "git merge". +Always do "git pull --rebase" and "git rebase" vs "git pull" or "git merge". See [rebasing a pull request](https://docs.ansible.com/ansible/latest/dev_guide/developing_rebasing.html) for more information. Always create a new branch for each pull request to avoid intermingling different features or fixes on the same branch. |