OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-14 23:00:05 +00:00
Code Issues Projects Releases Wiki Activity

Updated Typical Git Workflow (markdown)

bunnei 2014-06-13 11:47:23 -07:00
parent f7b8878759
commit 0eb49256cf
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Typical-Git-Workflow.md

@ -1,3 +1,5 @@
This is a guide to a typical Git workflow with Citra. It covers forking from the main repository, creating a branch, keeping your branch up to date with the main repository, resolving conflicts, and merging back into the main repository. It's not meant to be a hard-and-fast set of rules. However, if you following something along these lines, you'll be less likely to piss people off.
**Terminology**
* `upstream`: Main project repository (https://github.com/citra-emu/citra)
* `origin`: Your GitHub forked project repository (e.g. https://github.com/bunnei/citra)