mirror/yuzu-wiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Typical Git Workflow (markdown)

Browse Source
This commit is contained in:
Tobias 2018-08-25 13:24:37 +02:00
parent 11d9c79977
commit 0ccb125b9c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Typical-Git-Workflow.md
View File

@ -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.
* 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.