Sam Pierson's Blog

I recently ran across the following problem:

Multiple people are developing on the same project, pushing commits into the same (e.g. GitHub) repo.
Developer A is working, and commits locally.
Developer B converts a folder into a Git submodule.
Developer A tries to git pull… BOOM – unresolveable conflict, local repo is left in a mess.

The problem is that [...]

Somewhat following the instructions from rubyonrails.org:

Install Snow Leopard from DVD.
Install XCode tools from Optional Installs on same DVD.
Start 1Password – install 1Password3 when prompted.
Evernote Safari clipper seemed to be overwriting the 1Password button in Safari. Upgraded Evernote to release candidate, still had problem. Disabled Evernote Safari Clipper. Also enabled “Show in Top [...]

If you use a language name, e.g. “SQL” as the symbol for your ‘here’ document in TextMate, it will actually syntax highlight the text in the here document.
Very impressive, but I’m not switching from RubyMine.

It has been a while since I used git. To remind me, and perhaps you:

 
git checkout -b <feature_name>

Develop feature: code test commit rinse repeat.

 
git checkout master
git merge <feature_name>
git branch -d <feature_name>

This is just a place to hold my bookmarks relating to use of CSS Grid Systems:

YUI/Blueprint/960gs comparison chart: http://synapse.neural9.com/css-frameworks-comparison-chart/
Site dedicated to grid system design: http://www.thegridsystem.org/

Use http://github.com/gumayunov/custom-err-msg/tree/master
Put a ^ at the start of the :message => option:
Non-base messages are prefixed with the attribute name as usual UNLESS they begin with ‘^’
in which case the attribute name is omitted.

This can be a pain to find so here is the quick access version:
<width>x<height><specifier>
% Interpret width and height as a percentage of the current size.
! Resize to width and height exactly, loosing original aspect ratio.
< Resize only if the image is smaller than the geometry specification.
> Resize only if the image is greater than the [...]