Git
techniques
Agenda
-
You & Me
-
What do you know?
-
git flow anyone?!
-
git rebase
-
git bisect
Who are you?
I'm @Kjellski
What do you know?
Git flow anyone?!
I'm using the "simple" flow
- "master" is deployed
- features have their branch e.g. "feat/another-button"
- optional: have a branch for integration e.g. "develop"
A simple example
A---B---C topic <=
/
D---E---F---G master
A'--B'--C' topic <=
/
D---E---F---G master
> git checkout topic
> git rebase master
Another example
A---B---C topic <=
/
D---E---A'---F master
B'---C' topic <=
/
D---E---A'---F master
> git checkout topic
> git rebase master
'rebase --onto'
o---o---o---o---o master
\
o---o---o---o---o next
\
o---o---o topic <=
o---o---o---o---o master
| \
| o'--o'--o' topic <=
\
o---o---o---o---o next
> git checkout topic
> git rebase --onto master next topic
A word of caution
git bisect anyone?
Links
Git lightning talk
By Kjell Otto
Git lightning talk
This is my presentation accompanying the git lightning talk I'm doing at the C#/DotNet Meetup Hamburg - https://www.meetup.com/de-DE/Hamburg-C-Net-Meetup/events/hjllrrybclbhb/
