Skip to content

Commit 2dc746b

Browse files
kellyhogangundalow
authored andcommitted
fixes ansible#39585 typo fix under git practices (ansible#39604)
1 parent eb5e15e commit 2dc746b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

CODING_GUIDELINES.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,9 @@ In particular, metaclasses are probably not appropriate, however entertaining th
290290
Git Practices
291291
=============
292292

293-
Pull requests cannot be accepted that contain merge commits.
293+
Pull requests cannot be accepted if they contain merge commits.
294294

295-
Always do "git pull --rebase" and "git rebase" vs "git pull" or "git merge".
295+
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.
296296

297297
Always create a new branch for each pull request to avoid intermingling different features or fixes on the same branch.
298298

0 commit comments

Comments
 (0)