From 0e3e289d0ecb08fa17323a5c2fd129388658f81f Mon Sep 17 00:00:00 2001 From: Florian Paul Schmidt Date: Sat, 20 Mar 2010 06:49:00 +0000 Subject: [PATCH] (Commit created by redmine exporter script from page "Repository_Access" version 17) --- Repository_Access.textile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Repository_Access.textile b/Repository_Access.textile index e5ce9d8..f0a1896 100644 --- a/Repository_Access.textile +++ b/Repository_Access.textile @@ -53,25 +53,25 @@ 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. Get up to date +n4. 1. Get up to date 
./all update
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 +h4. 2. Create a branch 
./all branch
Then work on your changes, commit locally, etc, until you are happy.. -3. Push changes to the main repo +h4. 3. Push changes to the main repo 
./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. +h4. 4. Go back to 1. h2. Windows -- 2.39.2