Retooling Your Workflow

Retooling
YourWorkflow
Rebecca Murphey • @rmurphey
Saturday, November 13, 2010

[Note: Some slides have had content obscured
for the sake of confidentiality. Sorry.]

Or: Tools for
measuring the
quality of a client.

Or: Tools for
getting access to
more exciting,
better-paying
work.

Or: CYA.

I learned to tolerate terribleness.
TheProblem

TheLessons

A ticketing system brings sanity to client requests.
Emailisevil

Either the client needs to provide it, or I will.
Versioncontrol
isnon-negotiable

store step-by-step snapshots of your work
$ mate index.html
[make your changes]
$ git status
[see what’s changed]
$ git commit -am ‘changing jQuery version’
[commit any modified files already in the repo]
$ git push origin master
[send your changes to the server]

see what you’ve done
$ git log
[see a history of the repo]
$ git log -p
[see a full diff for each log entry]
$ git log --stat
[see a short version of what changed per entry]
$ git log -SmethodName
[see commits whose diffs included ‘methodName’]

streamline the process of deploying new code
to a server with tags
[locally ...]
$ git tag -a v1.3
$ git push --tags [tell the server about the tag!]
[then, on your server]
$ git pull
$ git checkout v1.3

rapidly roll back bad code on the server
[on your server]
$ git checkout v1.3
[all hell breaks loose]
$ git checkout v1.2
[now to figure out what broke]

identify the change that made your code break
$ git bisect start
$ git bisect good v1.2
[marks v1.2 tag as good]
$ git bisect bad master
[marks current code as bad]
[git will now present you with commits to test; each
should be marked with ‘git bisect good’ or ‘git bisect
bad’ until you arrive at the commit that broke]

work on experimental changes without
breaking your stable code
$ git checkout -b newfeature
$ git branch
[confirm you’re on the newfeature branch]
[work on your new feature and commit as normal; commits
will not touch the “master” code]

$ git pull --rebase
[gets any changes others have made]
$ git rebase master
[do this often & resolve conflicts early if you’re
working with others!]
$ git checkout master
$ git merge newfeature
[merge your changes back into master]
stay up to date with changes in the core code

$ git add --patch
[choose which of your changes to add]
$ git commit -v
[see your diff when writing your commit message]
$ git stash
[stash your changes for now]
$ git stash pop
[restore your last stashed changes]
$ git rebase -i master~10
[edit (!) the last 10 commits]
more insanely useful things

Just use the command line.

Aboutthoseclients...

Step 1: Fire bad clients. Srsly.

Step 2: Don’t ask for permission.
$ mkdir newproject
$ cd newproject
$ git init

Step 3: Help clients see the value.

Github makes it stupid simple.
Gettingstarted

rebeccamurphey.com
@rmurphey
http://pinboard.in/u:rmurphey/t:git/
http://pinboard.in/u:rmurphey/t:workflow/
Originally presented at indieconf 2010, Raleigh, N.C.

Retooling Your Workflow

Recomendados

Recomendados

Más contenido relacionado

Más de Rebecca Murphey

Más de Rebecca Murphey (11)

Último

Último (20)

Retooling Your Workflow