Typical Git workflow: Difference between revisions
mNo edit summary |
m (→References) |
||
| Line 3: | Line 3: | ||
Normal workflow is to develop and check in on a branch, then once everything is happy, merge the branch back into the master. | Normal workflow is to develop and check in on a branch, then once everything is happy, merge the branch back into the master. | ||
== References<br> == | == References<br> == | ||
<span style="line-height: 1.5em;"> | <span style="line-height: 1.5em;">[https://confluence.atlassian.com/display/STASH/Basic+Git+commands https://confluence.atlassian.com/display/STASH/Basic+Git+commands]</span> | ||
[http://rogerdudler.github.io/git-guide/ http://rogerdudler.github.io/git-guide/] | |||
[http://robert-reiz.com/2011/10/01/git-add-commit-push-pull/ http://robert-reiz.com/2011/10/01/git-add-commit-push-pull/] | [http://robert-reiz.com/2011/10/01/git-add-commit-push-pull/ http://robert-reiz.com/2011/10/01/git-add-commit-push-pull/] | ||
Revision as of 21:10, 11 September 2013
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