Git Workflow With Gitflow
Upcoming SlideShare
Loading in...5
×
 

Like this? Share it with your network

Share

Git Workflow With Gitflow

on

  • 2,427 views

 

Statistics

Views

Total Views
2,427
Views on SlideShare
2,400
Embed Views
27

Actions

Likes
4
Downloads
21
Comments
0

2 Embeds 27

http://www.enthuse.me 25
http://www.linkedin.com 2

Accessibility

Categories

Upload Details

Uploaded via as Adobe PDF

Usage Rights

© All Rights Reserved

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

Git Workflow With Gitflow Presentation Transcript

  • 1. Git Workflow with Gitflow
  • 2. What is a workflow? "...consists of a sequence of connected steps.." - Wikipedia What are we looking? An way to multiple developers integrate a working code into a project
  • 3. GitFlow
  • 4. Why Gitflow? ■ Based on the graph you just saw. ■ Github - https://github.com/nvie/gitflow ■ Shortcuts for repetitive tasks. ■ Branch naming convention "<prefix>/<name>" ■ 2 main branches.
  • 5. Main branches 1. master -> production-ready 2. develop -> latest for next release Their lifetime is infinite.
  • 6. Gitflow - prepare repository $git flow init When creating a new git flow workflow it ask you questionsthe names of the branches - USE DEFAULTS. when this is done a new develop branch is createdfrom master and from this point you never commit tomaster branch anymore.
  • 7. Gitflow - Supporting branches There are 4 supporting branches: 1. feature 2. release 3. hotfix 4. support I will cover only feature since this is the only one you willwith.
  • 8. Gitflow - Feature branches● May branch off from: develop branch● Must merge back into: develop branch● Branch naming convention: anything except master, develop, release/*, hotfix/* - our branching name will consist with 3base_<issue #>_<feature name>● Typically exist in developer repos only, not in origin - from time to time I will ask to also push the specific branch also to origin.
  • 9. Gitflow - Create feature branches$git flow feature start 3base_<issue #>_<feature name>This is what it does:$git checkout -b feature/3base_<issue #>_<feature name> develop
  • 10. Gitflow - finish feature branch ● git flow feature finish <feature name>$git checkout develop$git merge --no-ff myfeature - merges the branch to develop.$git branch -d myfeature - deletes the local branch$git push origin develop - push develop.The --no-ff flag avoids losing information about the historicalexistence of a feature
  • 11. More on the subject ● gitflow on github -https://github.com/nvie/gitflow. ● A successful git branching model ● A short introduction to git-flow ● On the path with git-flow