Some information:
- I am one developer working on one site.
- I use git for version control.
- I have several computers that I work on: office, home and laptop.
I currently have a central, open repository on my server. Each computer clones and moves the changes to this repository. I currently have a Master branch and a dev branch. All work is done in the dev branch. The master is always a current, stable production code. Changes can be applied to Master at any time along with changes that occur in dev.
My daily workflow consists of:
git checkout dev
//pull in changes from remote
git pull
//make and commit changes as need throughout the day
git add -u
git commit
//these steps only happens when I know master has changed
git checkout master
git pull
git checkout dev
git rebase master //to get changes to master into dev branch
//push changes to central remote at end of day
git push
I believe this should be a fairly standard workflow for one developer.
, . , , . dev - dev, . , . , / . Master, dev Master, , . .
, - . , , , . , Master, . , , , , .
, , , - . , 15 . 07/12/2012 - 08/24/2012. , , . , , , , .
, , . , , , .
, , , , , ? , , - . . , .