Skip to content

Instantly share code, notes, and snippets.

@andrewwheal

andrewwheal/01 before anything happens

Forked from Altreus/01 before anything happens
Created April 12, 2012 10:21
Show Gist options
  • Save andrewwheal/2366294 to your computer and use it in GitHub Desktop.
Save andrewwheal/2366294 to your computer and use it in GitHub Desktop.
Download ZIP
rebasing
Raw
01 before anything happens
master o-o-o-o-o-A
A - original master
Raw
02 feature started
master o-o-o-o-o-A
\
feature B
A - original master
B - first feature commit
Raw
03 feature worked on
master o-o-o-o-o-A
\
feature B-o-o-o-o
A - original master
B - first feature commit
Raw
04 updates requested
updates C
/
master o-o-o-o-o-A
\
feature B-o-o-o-o
A - original master
B - first feature commit
C - first update commit
Raw
05 merge master with updates
updates
master o-o-o-o-o-A-C
\
feature B-o-o-o-o
A - original master
B - first feature commit
C - first update commit
Raw
06 feature is based on old master so rebase
updates
master o-o-o-o-o-A-C
\
feature B-o-o-o-o
A - original master
B - first feature commit
C - first update commit
Raw
07 more updates more work on feature
updates D-o-o
/
master o-o-o-o-o-A-C
\
feature B-o-o-o-o-E-o-o-o
A - original master
B - first feature commit
C - first update commit
D - new update commit
E - new feature commit
Raw
08 updates go live
updates
master o-o-o-o-o-A-C-D-o-o
\
feature B-o-o-o-o-E-o-o-o
A - original master
B - first feature commit
C - first update commit
D - new update commit
E - new feature commit
Raw
09 feature goes live
1. rebase
updates
master o-o-o-o-o-A-C-D-o-o
\
feature B-o-o-o-o-E-o-o-o
2. merge feature into master (fast-forward)
updates
master o-o-o-o-o-A-C-D-o-o-B-o-o-o-o-E-o-o-o
feature
A - original master
B - first feature commit
C - first update commit
D - new update commit
E - new feature commit
Raw
10 dont do this
1. new update
updates C
/
master o-o-o-o-o-A
\
feature B-o-o-o-o
2. merge updates into master
updates
master o-o-o-o-o-A-C
\
feature B-o-o-o-o
3. merge feature into master
master o-o-o-o-o-A-C---------?
\ /
feature B-o-o-o-o
? - the fuck is this commit for?
Raw
don't do this
1. new update
updates C
/
master o-o-o-o-o-A
\
feature B-o-o-o-o
2. merge updates into master
updates
master o-o-o-o-o-A-C
\
feature B-o-o-o-o
3. merge feature into master
master o-o-o-o-o-A-C---------?
\ /
feature B-o-o-o-o
? - the fuck is this commit for?
Raw
more updates, more work on feature
updates D-o-o
/
master o-o-o-o-o-A-C
\
feature B-o-o-o-o-E-o-o-o
A - original master
B - first feature commit
C - first update commit
D - new update commit
E - new feature commit
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment