From c785a9bd5868c6da78898a75b84252a60eafc544 Mon Sep 17 00:00:00 2001 From: Alex Grin Date: Wed, 19 Jul 2017 18:55:11 -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 e503993..c4ea568 100644 --- a/Branching-and-Merging.md +++ b/Branching-and-Merging.md @@ -39,6 +39,8 @@ We want a merge commit present for all code merged from PRs, even if that PR is # on your_branch_name git fetch git rebase origin/master +# if there are conflicts at this point, ask the PR creator to fix them. run `git rebase --abort` to abort +# if no conflicts, proceed ... git checkout master git pull git merge --no-ff your_branch_name