From a6a1acbf1c9f9dfd1211d79a5a55837f0839de3a Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 16 Jun 2014 20:45:56 -0700 Subject: [PATCH] Updated Typical Git Workflow (markdown) --- Typical-Git-Workflow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Typical-Git-Workflow.md b/Typical-Git-Workflow.md index 2d0cb01..6ce5cdf 100644 --- a/Typical-Git-Workflow.md +++ b/Typical-Git-Workflow.md @@ -38,7 +38,7 @@ It's appreciated if every single commit in a branch on its own compiles on all s * `git checkout new-branch-name` * `git rebase -i upstream/master` * Update `origin/new-branch-name` - * `git push origin/new-branch-name --force` + * `git push origin new-branch-name --force` * Create the pull request on GitHub to merge `origin/new-branch-name` into `upstream/master` **Gracefully receive feedback from the team** @@ -51,7 +51,7 @@ It's appreciated if every single commit in a branch on its own compiles on all s * Rebase `upstream/master` onto your branch to ensure that you have any changes made since your pull request was created * `git rebase -i upstream/master` * Update `origin/new-branch-name` - * `git push origin/new-branch-name --force` + * `git push origin new-branch-name --force` * Merge your branch in * Always merge using the >merge< button in the GitHub pull request * If GitHub says the branch cannot be merged automatically, you've likely done something incorrectly (e.g. you did not fully rebase changes from `upstream/master` into your branch). If things don't work for you, don't hesitate to ask us for help @ #citra on [freenode](http://webchat.freenode.net/). Mastering Git is not as easy as it might sound, but we'll happily help you get started. \ No newline at end of file