From 0eb49256cf78a0c6433200b85d83313dab51c86e Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 13 Jun 2014 11:47:23 -0700 Subject: [PATCH] Updated Typical Git Workflow (markdown) --- Typical-Git-Workflow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Typical-Git-Workflow.md b/Typical-Git-Workflow.md index 8b675de..ca4ffc7 100644 --- a/Typical-Git-Workflow.md +++ b/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)