Difference between revisions of "Git"
From Wiki2
(Created page with "===git=== ====localhost==== The idea is to have production code on soupteam.com and then a copy of that code on localhost hpc. That copy has a branch that you can try fixes in. ...") |
m |
||
| Line 11: | Line 11: | ||
add. commit | add. commit | ||
push | ====normal test process===== | ||
$ git push origin loco | =====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 | |||
====once new code is tested on server from (loco)==== | |||
Revision as of 14:20, 8 December 2011
git
localhost
The idea is to have production code on soupteam.com and then a copy of that code on localhost hpc. That copy has a branch that you can try fixes in. When they are ready to go live then you push them to github and merge. Ifit doesn't work out you can role back.
Started by cloning (which creates a remote named 'origin')
$ git clone git@github.com:mckennatim/OBsoup.git
Then I created a branch:
$ git checkout -b loco Switched to a new branch 'loco'
add. commit
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
