Git

techniques

/at @DOTNETHH

/by @kjellski

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"

when to rebase

and 

when not to rebase

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?

So long,

and thanks for all the fish! :)

 

In doubt, it's 42, trust me...

 

Contact me:

info@kjell-otto.de / https://twitter.com/kjellski

Links

Made with Slides.com