From 2dc746bcc3b4bb3718239504c9427421a1656b94 Mon Sep 17 00:00:00 2001 From: Kelly Hogan Date: Wed, 2 May 2018 10:00:21 -0400 Subject: [PATCH] fixes #39585 typo fix under git practices (#39604) --- CODING_GUIDELINES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CODING_GUIDELINES.md b/CODING_GUIDELINES.md index 682b3fe7a18..4c3335b21ea 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.