-
Notifications
You must be signed in to change notification settings - Fork 9
Workflow
Michal Hozza edited this page Jan 5, 2014
·
17 revisions
- git checkout -b new_feature master
- git commit
- git pull --rebase origin
- Pull request
Reviewer - Request changes (Optional) //samozrejme autor feature clovek potom aplikuje zmeny a spravi novy pullrequest
- Merge pull request //Ak uz je vsetko OK
git checkout feature
git rebase origin/master
by malo byt to co chceme alebo
git checkout master
git pull origin master
git checkout feature
git rebase master
potom treba spravit force push (co je jediny pripad kedy to chceme robit) - ale treba si dat pozor
Pripadne si pozrite toto:
http://www.atlassian.com/git/workflows#!workflow-centralized
- zakomentovany kod
- nefunkcny kod (do vlastnej branche vprincipe mozte, ale je vhodne to mat v popise ze ten commit nie je funkcny)