Skip to content

Instantly share code, notes, and snippets.

@ngokevin

ngokevin/gist:2704202

Created May 15, 2012 18:58
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ngokevin/2704202 to your computer and use it in GitHub Desktop.
Save ngokevin/2704202 to your computer and use it in GitHub Desktop.
Download ZIP
merge conflict
Raw
gistfile1.txt
(zamboni)ngoke@mozzarella:~/Code/zamboni/apps$ git pull mozilla master
From github.com:mozilla/zamboni
* branch master -> FETCH_HEAD
Auto-merging templates/qunit/qunit.html
CONFLICT (content): Merge conflict in templates/qunit/qunit.html
Auto-merging mkt/settings.py
Auto-merging mkt/inapp_pay/views.py
Auto-merging mkt/asset_bundles.py
Auto-merging mkt/account/views.py
Auto-merging media/js/zamboni/tests/install_button_tests.js
Auto-merging media/js/zamboni/buttons.js
Auto-merging media/js/mkt/buttons.js
Auto-merging media/js/mkt/apps.js
CONFLICT (content): Merge conflict in media/js/mkt/apps.js
Auto-merging docs/topics/api.rst
CONFLICT (add/add): Merge conflict in docs/topics/api.rst
Removing apps/amo/templates/services/plugin_check.xml
Automatic merge failed; fix conflicts and then commit the result.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment