Skip to content

Commit

Permalink
fixes ansible#39585 typo fix under git practices (ansible#39604)
Browse files Browse the repository at this point in the history
  • Loading branch information
kellyhogan authored and gundalow committed May 2, 2018
1 parent eb5e15e commit 2dc746b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CODING_GUIDELINES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit 2dc746b

Please sign in to comment.