Skip to content

Instantly share code, notes, and snippets.

@eladmeidar

eladmeidar/gist:164881

Created August 9, 2009 19:30
Show Gist options
  • Save eladmeidar/164881 to your computer and use it in GitHub Desktop.
Save eladmeidar/164881 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
activerecord/ activeresource/
elad-meidars-computer-3:rails eladmeidar$ git add activeresource/lib/active_resource/connection.rb
elad-meidars-computer-3:rails eladmeidar$ git commit -c 84f2984
activeresource/test/connection_test.rb: needs merge
activeresource/test/connection_test.rb: unmerged (ead7204eb244829d88dfb5892e846e03c7312d5d)
activeresource/test/connection_test.rb: unmerged (12e8058b0c849730fcfb5aa9a233e7422106c606)
activeresource/test/connection_test.rb: unmerged (2425edba4df72e8d8abadb7ddd4d621edf76e7f2)
error: Error building trees
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment