From 3234e192544170f26fe4bac05b673a2d1bf1de2a Mon Sep 17 00:00:00 2001 From: Alex Grin Date: Wed, 24 Oct 2018 09:56:06 -0400 Subject: [PATCH] Updated Branching and Merging (markdown) --- Branching-and-Merging.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Branching-and-Merging.md b/Branching-and-Merging.md index d501c1b..52a47f4 100644 --- a/Branching-and-Merging.md +++ b/Branching-and-Merging.md @@ -48,6 +48,7 @@ git merge --no-ff your_branch_name git push git push --delete origin your_branch_name ``` +**Note:** There's no way to do this exact flow when merging PRs on Github. If you use the "create merge commit" option, it will not rebase. If you use "rebase and merge", it will not create a merge commit. In light of this, if you're gonna merge on Github, its ok not to rebase beforehand. Please still try to rebase when you can, for example before you create the PR. It this makes the history a lot easier to read. ## Example