Git

git

the work flow

The idea is to have production code on soupteam.com and then a copy of that code on locally. That copy has a branch that you can try fixes in. When they are working well locally you can try them on the server. When they are ready to go live you can merge the branch with the master.

the setup

Started by cloning code on your local machine(which creates a remote named 'origin')

$ git clone git@github.com:mckennatim/OBsoup.git

Then create a branch for putting new features:

$ git checkout -b loco
Switched to a new branch 'loco'

normal test process

locally

do some editing locally on a (loco)branch and test locally then add. and commit locally

(loco)$git add .
(loco)$git commit -m "my local edits"

push that branch to github

(loco)$git push origin loco

server

try the local changes by fetching origin then fast-forward the server branch by

(loco)$git fetch origin 
(loco)$git merge origin/loco

Now the server is running from the loco branch. If you want it running from the older master code

(loco)$git checkout master
(master)$