Using git on Colorless
Cloning
Please clone whatever you work on to your local machine. It can be your /home/user directory, but you have to clone:
- Dev:
git clone git@[IPADDR]/home/hubs/colorless.dev.git
- Make sure that your clone repository knows about the both hubs. One, from which you cloned, will be the origin. Assuming you cloned from Live, add the other hub with:
git remote add live git@[IPADDR]/home/hubs/colorless.front.git
That means that Dev will be called origin on your local machine and Dev will be called live.
Working
Edit the files in the local repository, the one you created by cloning. After you made a change, do one or all of these:
git add .
git commit -a -m “I made some bad-ass changes”
Deploying changes
After you committed your changes locally, you can deploy them to either Dev or Live. The workflow is usually:
- Push to Dev
- Check Dev in your browser
- Everything fine, push to Live
That can be done using these commands:
git push dev master
git push live master
Under no circumstances
Do not hack in the live repositories. Do not open them, do nothing with them, unless you really, really need to because of merging issues. Those basically only spring up if you don't follow this workflow, though, so you should be fine.
Good luck.