From: Florian Paul Schmidt <mista.tapas@gmx.net>
Date: Sat, 20 Mar 2010 06:48:00 +0000 (+0000)
Subject: (Commit created by redmine exporter script from page "Repository_Access" version 16)
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=481f2c3bcc6bd208dedbd0f8df2e1838334bf75e;p=xonotic%2Fxonotic.wiki.git

(Commit created by redmine exporter script from page "Repository_Access" version 16)
---

diff --git a/Repository_Access.textile b/Repository_Access.textile
index a24e4b1..e5ce9d8 100644
--- a/Repository_Access.textile
+++ b/Repository_Access.textile
@@ -53,15 +53,21 @@ To make working with the repo a little easier there's a little helper script (it
 
 The normal workflow for working on a contribution is the following:
 
-1. <pre>./all update</pre>
+1. Get up to date
 
-This makes sure you are up to date
+<pre>./all update</pre>
 
-2. ./all branch <your branch name here>
+This makes sure you are up to date. And should lessen the merging horror that might ensue when you try to push..
+
+2. Create a branch
+
+<pre>./all branch <your branch name here></pre>
 
 Then work on your changes, commit locally, etc, until you are happy..
 
-3. ./all push
+3. Push changes to the main repo
+
+<pre>./all push</pre>
 
 This asks you what to push, etc.. This might fail, if in the meantime someone else has worked on the same branch. You will need to use git merge manually for the time being to resolve possible conflicts..