gistfile1.txt

Intergalactic:hud andy$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: added semantic framework
Using index info to reconstruct a base tree...
M	Gemfile
M	Gemfile.lock
Falling back to patching base and 3-way merge...
Auto-merging Gemfile.lock
Auto-merging Gemfile
Applying: Fix variables/mixins support for sass
Applying: style
Applying: initial layyout
Applying: style
Applying: added semantic framework
Using index info to reconstruct a base tree...
M	Gemfile
M	Gemfile.lock
M	app/assets/javascripts/application.js.coffee
M	app/assets/stylesheets/application.css.scss
Falling back to patching base and 3-way merge...
Auto-merging app/assets/stylesheets/application.css.scss
CONFLICT (content): Merge conflict in app/assets/stylesheets/application.css.scss
Failed to merge in the changes.
Patch failed at 0006 added semantic framework
The copy of the patch that failed is found in:
   /Users/andy/Sites/repository/hud/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".