Skip to content

Instantly share code, notes, and snippets.

@tannishk

tannishk/editor.js

Created August 11, 2015 17:57
Show Gist options
  • Save tannishk/6e12f9e344eee2756851 to your computer and use it in GitHub Desktop.
Save tannishk/6e12f9e344eee2756851 to your computer and use it in GitHub Desktop.
Download ZIP
Conflict error
Raw
editor.js
Using index info to reconstruct a base tree...
M airmozilla/popcorn/static/popcorn/js/editor.js
Falling back to patching base and 3-way merge...
Auto-merging airmozilla/popcorn/static/popcorn/js/editor.js
CONFLICT (content): Merge conflict in airmozilla/popcorn/static/popcorn/js/editor.js
Failed to merge in the changes.
Patch failed at 0002 bug 1181198
The copy of the patch that failed is found in:
/Users/tannishk/Documents/airmozilla/.git/rebase-apply/patch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment