From 0ccb125b9c977805d04983c2091f9b355b5f0feb Mon Sep 17 00:00:00 2001 From: Tobias Date: Sat, 25 Aug 2018 13:24:37 +0200 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 0136a60..a239109 100644 --- a/Typical-Git-Workflow.md +++ b/Typical-Git-Workflow.md @@ -59,4 +59,4 @@ It's appreciated if every single commit in a branch on its own compiles on all s * `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 @ #yuzu on [freenode](http://webchat.freenode.net/) or @ #yuzu-general on [Discord](https://yuzu-emu.org/discord/). Mastering Git is not as easy as it might sound, but we'll happily help you get started. \ No newline at end of file + * 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 @ #yuzu on [freenode](http://webchat.freenode.net/) or @ #yuzu-general on [Discord](https://discordapp.com/invite/u77vRWY). Mastering Git is not as easy as it might sound, but we'll happily help you get started. \ No newline at end of file