Created
August 11, 2015 17:57
-
-
Save tannishk/6e12f9e344eee2756851 to your computer and use it in GitHub Desktop.
Conflict error
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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