Skip to content

Workflow

Michal Hozza edited this page Nov 1, 2015 · 17 revisions

Strucny popis toho ako by mal vyzerat vyvoj 1 feature

  1. git checkout -b new_feature master
  2. git commit
  3. git pull --rebase origin
  4. Pull request
  5. Wait for review
  6. Merge pull request If accepted by reviewer or Apply changes and goto 5. otherwise

Reviewer
5. Accept or Request changes

Pripadne si pozrite toto:
http://www.atlassian.com/git/workflows#!workflow-centralized

Rebasovanie pullrequestu

git checkout master
git pull origin master
git checkout feature
git rebase master

alebo skratene

git fetch
git checkout feature
git rebase origin/master

potom treba spravit force push (co je jediny pripad kedy to chceme robit) - ale treba si dat pozor

git push origin feature --force

Co nepchat do gitu:

  • zakomentovany kod
  • nefunkcny kod (do vlastnej branche vprincipe mozte, ale je vhodne to mat v popise ze ten commit nie je funkcny)