gistfile1.eclass

~/p# git clone git@heroku.com:premier-demo.git LocableDemo
Initialized empty Git repository in /Users/pb/p/LocableDemo/.git/
remote: Counting objects: 7378, done.
remote: Compressing objects: 100% (6136/6136), done.
remote: Total 7378 (delta 4193), reused 2286 (delta 732)
Receiving objects: 100% (7378/7378), 4.91 MiB | 297 KiB/s, done.
Resolving deltas: 100% (4193/4193), done.
~/p# cd LocableDemo
LocableDemo[master]/# git remote add core git@github.com:brianmba/LocableCore.git
LocableDemo[master]/# git remote show core
* remote core
  Fetch URL: git@github.com:brianmba/LocableCore.git
  Push  URL: git@github.com:brianmba/LocableCore.git
  HEAD branch: master
  Remote branches:
    master                new (next fetch will store in remotes/core)
    sidebar_edit_20110127 new (next fetch will store in remotes/core)
  Local ref configured for 'git push':
    master pushes to master (local out of date)
LocableDemo[master]/# git pull core sidebar_edit_20110127
warning: no common commits
remote: Counting objects: 6033, done.
remote: Compressing objects: 100% (2233/2233), done.
remote: Total 6033 (delta 3560), reused 6033 (delta 3560)
Receiving objects: 100% (6033/6033), 4.52 MiB | 212 KiB/s, done.
Resolving deltas: 100% (3560/3560), done.
From github.com:brianmba/LocableCore
 * branch            sidebar_edit_20110127 -> FETCH_HEAD
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging README
CONFLICT (add/add): Merge conflict in README
Auto-merging app/controllers/admin/sidebar_controller.rb
CONFLICT (add/add): Merge conflict in app/controllers/admin/sidebar_controller.rb
Auto-merging app/helpers/admin/sidebar_helper.rb
CONFLICT (add/add): Merge conflict in app/helpers/admin/sidebar_helper.rb
Auto-merging app/helpers/application_helper.rb
CONFLICT (add/add): Merge conflict in app/helpers/application_helper.rb
Auto-merging app/views/admin/sidebar/_actives.html.erb
CONFLICT (add/add): Merge conflict in app/views/admin/sidebar/_actives.html.erb
Auto-merging app/views/admin/sidebar/index.html.erb
CONFLICT (add/add): Merge conflict in app/views/admin/sidebar/index.html.erb
Auto-merging app/views/articles/_rotator.html.erb
CONFLICT (add/add): Merge conflict in app/views/articles/_rotator.html.erb
Auto-merging app/views/columns/_list.html.erb
CONFLICT (add/add): Merge conflict in app/views/columns/_list.html.erb
Auto-merging app/views/shared/_nav.html.erb
CONFLICT (add/add): Merge conflict in app/views/shared/_nav.html.erb
Auto-merging app/views/shared/_weather_and_date.html.erb
CONFLICT (add/add): Merge conflict in app/views/shared/_weather_and_date.html.erb
Auto-merging config/environment.rb
CONFLICT (add/add): Merge conflict in config/environment.rb
Auto-merging config/initializers/hlyo.rb
CONFLICT (add/add): Merge conflict in config/initializers/hlyo.rb
Auto-merging public/stylesheets/gallery.css
CONFLICT (add/add): Merge conflict in public/stylesheets/gallery.css
Auto-merging themes/default/stylesheets/style.css
CONFLICT (add/add): Merge conflict in themes/default/stylesheets/style.css
Auto-merging vendor/plugins/static_sidebar/views/content.rhtml
CONFLICT (add/add): Merge conflict in vendor/plugins/static_sidebar/views/content.rhtml
Automatic merge failed; fix conflicts and then commit the result.