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

[xonotic/xonotic.wiki.git] / Repository_Access.textile

diff --git a/Repository_Access.textile b/Repository_Access.textile
index 24eedd1ff7f4b784a24dae5b4c03016326c01e10..a24e4b18dd4c530b78b2c999ab0d177456351e9f 100644 (file)
--- a/Repository_Access.textile
+++ b/Repository_Access.textile
@@ -40,29 +40,34 @@ git config remote.origin.url ssh://xonotic@git.xonotic.org/xonotic.git
 
 After that, you can write to the reposiotry using the usual git commands (commit, push).
 
-h2. Windows
-
-TODO info for TortoiseGit
-
-h3. Working with the helper script all
+h3. Working with the helper script "all"
 
 To make working with the repo a little easier there's a little helper script (it's called all, as mentioned in above clone commands). It supports the following commands:
 
+<pre>
 ./all update
 ./all branch
 ./all push
 ./all checkout
+</pre>
 
 The normal workflow for working on a contribution is the following:
 
-./all update
+1. <pre>./all update</pre>
 
 This makes sure you are up to date
 
-./all branch <your branch name here>
+2. ./all branch <your branch name here>
 
 Then work on your changes, commit locally, etc, until you are happy..
 
-./all push
+3. ./all push
+
+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..
+
+4. Go back to 1.
+
 
-This asks you what to push, etc..
+h2. Windows
+
+TODO info for TortoiseGit