Mais conteúdo relacionado 8. We need…
• Flexibility
• Collaboration
• Recoverability
• Awesomesauce
• Impatient
• Disorganized
• Indecisive
• Insecure
We are…
25. “There are two kinds of people in
this world—those who believe
there are two kinds of people in
this world and those who are
smart enough to know better.”
—Tom Robbins
Still Life with Woodpecker (2001)
30. Fetch and Rebase Workflow
$ git checkout -b my-feature-branch master
# work, stage, commit, repeat; then:
$ git fetch
$ git rebase origin/master
$ git checkout master
$ git merge origin/master
$ git merge --no-ff my-feature-branch
$ git push origin master
31. Fetch and Rebase Workflow
$ git checkout my-feature-branch
$ git merge master
# work, stage, commit, repeat; then:
$ git fetch
$ git rebase origin/master
$ git checkout master
$ git merge origin/master
$ git merge --no-ff my-feature-branch
$ git push origin master
33. Thou Shalt Not Rebase Commits
Thou Hast Pushed To a Remote Repository.
35. Topic Branch Workflow
$ git checkout master
$ git pull
$ git checkout -b topic-branch-1 master
$ git checkout -b topic-branch-2 master
$ git checkout -b topic-branch-3 master
$ git checkout -b topic-branch-4 master
# work and push
$ git checkout -b staging master
$ git merge topic-branch-1 topic-branch-2 # etc.
$ git checkout master
$ git merge staging
51. Thou Shalt Not Rebase Commits
Thou Hast Pushed To a Remote Repository.
