gistfile1.txt

9:10:24] bcorrales:personal $ cd askbot-devel
[9:10:28] bcorrales:askbot-devel git:(master) $ git remote add askbot https://github.com/ASKBOT/askbot-devel.git
[9:10:37] bcorrales:askbot-devel git:(master) $ git fetch askbot
remote: Counting objects: 2516, done.
remote: Compressing objects: 100% (852/852), done.
remote: Total 1874 (delta 1385), reused 1462 (delta 993)
Receiving objects: 100% (1874/1874), 2.74 MiB | 56 KiB/s, done.
Resolving deltas: 100% (1385/1385), completed with 238 local objects.
From https://github.com/ASKBOT/askbot-devel
 * [new branch]      admin-interface -> askbot/admin-interface
 * [new branch]      adminarea  -> askbot/adminarea
 * [new branch]      adolfo-postman -> askbot/adolfo-postman
 * [new branch]      allow-other-login-apps -> askbot/allow-other-login-apps
 * [new branch]      anon-posting -> askbot/anon-posting
 * [new branch]      askbot-site -> askbot/askbot-site
 * [new branch]      auto-media-revisions -> askbot/auto-media-revisions
 * [new branch]      avatars-sidebar -> askbot/avatars-sidebar
 * [new branch]      beta2-english-chinese -> askbot/beta2-english-chinese
 * [new branch]      better-setup -> askbot/better-setup
 * [new branch]      blockip    -> askbot/blockip
 * [new branch]      bug102     -> askbot/bug102
 * [new branch]      bugfixes   -> askbot/bugfixes
 * [new branch]      cache-experiment -> askbot/cache-experiment
 * [new branch]      categories -> askbot/categories
 * [new branch]      cnprog-import -> askbot/cnprog-import
 * [new branch]      common-question-view -> askbot/common-question-view
 * [new branch]      development -> askbot/development
 * [new branch]      django-registration -> askbot/django-registration
 * [new branch]      elastic-skin -> askbot/elastic-skin
 * [new branch]      experimental -> askbot/experimental
 * [new branch]      experimental-merge -> askbot/experimental-merge
 * [new branch]      fabian     -> askbot/fabian
 * [new branch]      fbconnect  -> askbot/fbconnect
 * [new branch]      feature73  -> askbot/feature73
 * [new branch]      fix-en-i18n -> askbot/fix-en-i18n
 * [new branch]      follow-user -> askbot/follow-user
 * [new branch]      gh-pages   -> askbot/gh-pages
 * [new branch]      inbox-and-flagged-items -> askbot/inbox-and-flagged-items
 * [new branch]      issue116   -> askbot/issue116
 * [new branch]      jinja      -> askbot/jinja
 * [new branch]      master     -> askbot/master
 * [new branch]      master-test -> askbot/master-test
 * [new branch]      multi-auth-app -> askbot/multi-auth-app
 * [new branch]      new-template -> askbot/new-template
 * [new branch]      newauth    -> askbot/newauth
 * [new branch]      password-only -> askbot/password-only
 * [new branch]      postgres-full-text -> askbot/postgres-full-text
 * [new branch]      private-beta -> askbot/private-beta
 * [new branch]      pt-i18n    -> askbot/pt-i18n
 * [new branch]      question-page-caching -> askbot/question-page-caching
 * [new branch]      refs/heads/skins -> askbot/refs/heads/skins
 * [new branch]      remove-django-authopenid -> askbot/remove-django-authopenid
 * [new branch]      remove-recaptcha-module -> askbot/remove-recaptcha-module
 * [new branch]      signin-config -> askbot/signin-config
 * [new branch]      sophia     -> askbot/sophia
 * [new branch]      sphinx-search -> askbot/sphinx-search
 * [new branch]      stackexchange -> askbot/stackexchange
 * [new branch]      staticfiles -> askbot/staticfiles
 * [new branch]      user-groups -> askbot/user-groups
 * [new branch]      vlad111    -> askbot/vlad111
 * [new branch]      wikipost   -> askbot/wikipost
 * [new tag]         0.7.25     -> 0.7.25
 * [new tag]         0.7.26     -> 0.7.26
 * [new tag]         0.7.27     -> 0.7.27
 * [new tag]         0.7.28     -> 0.7.28
 * [new tag]         0.7.30     -> 0.7.30
 * [new tag]         0.7.31     -> 0.7.31
 * [new tag]         0.7.33     -> 0.7.33
 * [new tag]         0.7.34     -> 0.7.34
 * [new tag]         0.7.35     -> 0.7.35
 * [new tag]         0.7.36     -> 0.7.36
 * [new tag]         0.7.37     -> 0.7.37
 * [new tag]         0.7.38     -> 0.7.38
 * [new tag]         history+wikipost -> history+wikipost
 * [new tag]         remove     -> remove
 * [new tag]         show       -> show
[9:11:53] bcorrales:askbot-devel git:(master) $ git checkout -b askbot/master
Switched to a new branch 'askbot/master'

[9:18:40] bcorrales:askbot-devel git:(askbot/master) $ git pull askbot master

From https://github.com/ASKBOT/askbot-devel
 * branch            master     -> FETCH_HEAD
Auto-merging askbot/cron/askbot_cron_job
CONFLICT (content): Merge conflict in askbot/cron/askbot_cron_job
Auto-merging askbot/setup_templates/settings.py
Auto-merging askbot/setup_templates/settings.py.mustache
Auto-merging askbot/skins/default/media/style/style.css
CONFLICT (content): Merge conflict in askbot/skins/default/media/style/style.css
Automatic merge failed; fix conflicts and then commit the result.
[9:18:52] bcorrales:askbot-devel git:(askbot/master*) $