From 1864dbbf0dcb1d1e84dbe3bd752b39f90d59fa8e Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 13 Jun 2014 09:40:31 -0700 Subject: [PATCH] Updated Typical Git Workflow (markdown) --- Typical-Git-Workflow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Typical-Git-Workflow.md b/Typical-Git-Workflow.md index 9b8818f..e5fdc05 100644 --- a/Typical-Git-Workflow.md +++ b/Typical-Git-Workflow.md @@ -18,7 +18,7 @@ * Push your new branch to origin if you'd like * `git push origin new-branch-name` -**Scenario A: You did some work in your branch… Then, someone committed something to master that you want!** +**Scenario A: You did some work in your branch... Then, someone committed something to `upstream/master` that you want!** * Make sure you're on your branch * `git checkout new-branch-name` * Rebase upstream/master onto it. With the rebase, move all of your changes to the top, and put all of the new master changes immediately after where you branched from. The goal should be that the branch now appears as though you just created it, and then committed all of your new stuff.