From a128848a6c835764b766db7b6927175b752d0280 Mon Sep 17 00:00:00 2001 From: archshift Date: Sun, 8 Mar 2015 23:36:46 -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 bdbddca..ab96e68 100644 --- a/Typical-Git-Workflow.md +++ b/Typical-Git-Workflow.md @@ -28,7 +28,7 @@ It's appreciated if every single commit in a branch on its own compiles on all s * 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 from `upstream/master`, and then committed all of your new stuff. - * `git rebase -i upstream/master` + * `git rebase upstream/master` **Scenario B: You did some more work in your branch... Then, someone committed something to `upstream/master` that will cause conflicts when trying to get the branch merged back to upstream/master!** * From your branch, rebase `upstream/master`