Difference between revisions of "Typical Git workflow"
m |
m |
||
| Line 15: | Line 15: | ||
1) get local copy of code<br>2) create a branch<br>3) edit files<br>4) add/commit changes to local machine<br>5) get back in sync with changes commited by others<br>6) push branch to remote git repository<br>7) merge local branch into local master<br>8) push local master to remote git repostiory | 1) get local copy of code<br>2) create a branch<br>3) edit files<br>4) add/commit changes to local machine<br>5) get back in sync with changes commited by others<br>6) push branch to remote git repository<br>7) merge local branch into local master<br>8) push local master to remote git repostiory | ||
| + | <br> | ||
| + | '''For the TATAPowersed SDK we can set REPO and BRANCH as below:''' | ||
| − | |||
REPO=git@github.com:RidgeRun/tata-sdk-dm36x<br>BRANCH=fixed-ip-address | REPO=git@github.com:RidgeRun/tata-sdk-dm36x<br>BRANCH=fixed-ip-address | ||
== 1) Get a local copy of the code == | == 1) Get a local copy of the code == | ||
Revision as of 16:34, 11 September 2013
Contents
Introduction
Normal workflow is to develop and check in on a branch, then once everything is happy, merge the branch back into the master.
References
https://confluence.atlassian.com/display/STASH/Basic+Git+commands
http://rogerdudler.github.io/git-guide/
http://robert-reiz.com/2011/10/01/git-add-commit-push-pull/
Typical Workflow are as follows
1) get local copy of code
2) create a branch
3) edit files
4) add/commit changes to local machine
5) get back in sync with changes commited by others
6) push branch to remote git repository
7) merge local branch into local master
8) push local master to remote git repostiory
For the TATAPowersed SDK we can set REPO and BRANCH as below:
REPO=git@github.com:RidgeRun/tata-sdk-dm36x
BRANCH=fixed-ip-address
