• Share
  • Email
  • Embed
  • Like
  • Save
  • Private Content
Pragmatic Git workflow
 

Pragmatic Git workflow

on

  • 541 views

How to leverage git branches for clean and readable commit history.

How to leverage git branches for clean and readable commit history.

Statistics

Views

Total Views
541
Views on SlideShare
541
Embed Views
0

Actions

Likes
3
Downloads
6
Comments
0

0 Embeds 0

No embeds

Accessibility

Categories

Upload Details

Uploaded via as Microsoft PowerPoint

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

    Pragmatic Git workflow Pragmatic Git workflow Presentation Transcript

    • Pimp my Git Pragmatic Git workflow
    • Pulling the right way Building a house
    • Multiple teamsOne team builds the roof Another seeds grass on the yard
    • Conflictless cooperation Oh, really? git pull
    • Git problem #721“pull” does merge by default (rebase is an option)
    • Merging smarter git pull --rebase
    • Merge
    • Rebase
    • After rebase
    • CommandmentThou shalt pull with --rebase option.
    • Merging even smarter $ sudo gem install git-up
    • Building a house
    • My workflow Create a private branch and do some work.
    • In the meantimeSomeone else started working on the project
    • Risk of conflict
    • Rebase before merge On feature branch, rebase with master branch git rebase master
    • Resolve conflict Resolve conflict on your local branch git add . git rebase --continue
    • Merge with squashgit checkout mastergit merge feature --squashgit commit
    • Why? Clean history Each work item == one commitDo not trash log with checkpoint commits Conflicts resolved early Missing (unnecessary) granularity