Loading presentation...

Present Remotely

Send the link below via email or IM

Copy

Present to your audience

Start remote presentation

  • Invited audience members will follow you as you navigate and present
  • People invited to a presentation do not need a Prezi account
  • This link expires 10 minutes after you close the presentation
  • A maximum of 30 users can follow your presentation
  • Learn more about this feature in our knowledge base article

Do you really want to delete this prezi?

Neither you, nor the coeditors you shared it with will be able to recover it again.

DeleteCancel

Make your likes visible on Facebook?

Connect your Facebook account to Prezi and let your likes appear on your timeline.
You can change this under Settings & Account at any time.

No, thanks

git flow

No description
by

Yuya Tsukahara

on 14 March 2014

Comments (0)

Please log in to add your comment.

Report abuse

Transcript of git flow

feature
develop
develop
Git flow on feature
Create feature branch
git checkout develop
git pull origin develop

git checkout -b feature/[ticket_number]
or
git flow feature start [ticket_number]

feature/xxxx
git status
git checkout
git reset [--soft, --hard]
git add
git commit [-m, -am] "commit comment"
git log --graph -10
Merge branch "develop"
OR rebase
git pull origin develop

or

git fetch
git rebase -i origin/develop

...but "git push" will be reject if you pushed origin.
Git Push
Merge Request
git checkout -b feature/merge/[ticket_number]
or
git flow feature start merge/[ticket_number]

git merge --squash origin/feature/xxxx
git commit -m "[ticket_number] comment"

git push origin feature/merge/[ticket_number]
or
git flow feature publish merge/[ticket_number]
Merge Request Pattern
Code Review
Code review on Gitlab.
git push origin feature/xxxx

...in case of "git rebase"

git push -f origin feature/xxxx
1. Work in progress(WIP)

2. Merge branch feature into develop
release
develop
Git flow on release and master
Merge branch feature into develop
on Gitlab

or

git checkout develop
git pull origin develop
git merge --no-ff origin/feature/merge/[ticket_number]
git push origin develop
Create release branch
Finish release branch
git checkout master
git pull origin master
git flow release finish [ticket_number]
git push origin master

Merge branch "release" into develop and master.
but tag don't commit!
(git checkout develop)

git flow release start [ticket_number]
Full transcript