a handful of Git workflows for the agilist steven harman twitter: stevenharman

Transcription

1 a handful of Git workflows for the agilist steven harman twitter: stevenharman

2 stop worrying and start loving The Git. git is awesome - if you re using it, you know. if not, don t be scared, give it a try.

3 picture Git don t be scared, it s not as bad as it looks.

4 basic branch/ workflow

5 let s assume there already exists a Git repository somewhere in the cloud. like maybe... The GitHub.

6 :> git clone :> cd foo :> origin/ start by cloning a copy of that remote repository (conventionally known as origin ) to our local machine.

7 :> git checkout -b :> [... hackity-hack-hack...] :> git commit -am did something awesome. origin/ we need to work a sweet new. step 1) create a local branch to work in. step 2) hackity-hack-hack. step 3) commit the changes. [repeat steps 2 & 3 as necessary]

8 // someone else pushed a change to the remote. origin/ a teammate, or maybe even another you, has pushed some new changes.

9 :> [... more hackity-hack-hack...] :> git commit -am more awesomeness. bacon! origin/ [still continuing steps 2 & 3 from earlier]

10 :> git fetch origin origin/ origin/ get any new changes that are on the remote, but not local.

11 :> git checkout :> git merge origin/ origin/ origin/ origin/ merge the changes from the remote branch into our local branch. because there are no divergent changes on our local, this is a fast-forward merge along the s graph.

12 :> git merge origin/ origin/ origin/ origin/ now we need to merge our into so we can release it. option 1) merge in. [keeps all info, but we end up with a noisy history graph that s hard to follow]

13 origin/ origin/ origin/ OR [go back to just after we merged in the fetched changes]

14 this rewinds our branch back to where it started, then fast-forwards along, and finally re-applies each of our change sets. afterward, our local commits have a new SHA1 hash, meaning they are different objects than before rebase, however, the original committer info & meta-data are preserved. remote Git repository (origin) :> git checkout :> git rebase origin/ origin/ origin/ origin/ option 2) rebase our branch on top of.

15 :> git checkout :> git merge origin/ origin/ origin/ now we can merge our changes into. because we already have all of the changes that exist in, this results in a fast-forward merge onto.

16 :> git push origin origin/ origin/ origin/ origin/ finally we share our sweet, sweet bacon with the rest of the world by pushing our local changes to the remote (origin).

17 :> git branch -d origin/ origin/ origin/ origin/ now everyone can enjoy the bacony-goodness!

18 derivations branch for a spike branches for concurrent design push/pull changes directly from teammate stashing changes temporarily reset to prior commit (in case of FUBAR)

19 some cool tools for your Git utility belt git reset git stash git svn git cherry-pick git bisect git add -p git reflog add -p to interactively stage hunks of a file change.

20 get Git info (the site for THE book)

21 fork these slides from feel free to hit me up with any questions. steven harman twitter: stevenharman