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

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

diff --git a/Repository_Access.textile b/Repository_Access.textile
index 34c0ed3..b07d3ae 100644
--- a/Repository_Access.textile
+++ b/Repository_Access.textile
@@ -65,4 +65,4 @@ Then work on your changes, commit locally, etc, until you are happy..
 
 ./all push
 
-This asks you what to push, etc..
+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..