From 5c0ab8569a6e2c2b39ad9ffc8ee2d7b015753a6b Mon Sep 17 00:00:00 2001 From: Alex Grin Date: Wed, 19 Jul 2017 12:48:58 -0400 Subject: [PATCH] Updated Branching and Merging (markdown) --- Branching-and-Merging.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Branching-and-Merging.md b/Branching-and-Merging.md index 1b6ed9a..194d686 100644 --- a/Branching-and-Merging.md +++ b/Branching-and-Merging.md @@ -31,6 +31,8 @@ git push -u origin your_branch_name ## Rebase and non-ff-merge into master when you're done +We want a merge commit present for all code merged from PRs, even if that PR is only one commit. The merge commit documents that the merge came from a PR. This helps us differentiate between commits to straight master. + ``` git fetch git rebase origin/master