GitAndGitFlow Rebasing
So I've just had to rebase a eature branch with a small number of commits and thought I would write a wiki as to how I understand it.
Unfortunately, I didn't get an image of the network graph at each stage so we only have the final one (which I stitched together because I don't think there's a way to zoom out):
So I'll go in reverse for this plot:
- the final arrow going from black to pink is when I did
git flow feature finish -F AE_add_alcapana_nosie_plot - the arrow going from blue to black is when I did
git flow feature rebase - so the black line is my rebased feature branch (it has branched off the previous pink commit)
- the blue line is the original feature branch (which branched off the pink line a while before and had had a few other features finished into it)
That's a very rough explanation but is hopefully helpful to someone (if only me in a few days time :) )