Skip to content

Instantly share code, notes, and snippets.

@tmcw

tmcw/-

Created June 2, 2015 20:00
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 tmcw/693733c73fcc78ac804c to your computer and use it in GitHub Desktop.
Save tmcw/693733c73fcc78ac804c to your computer and use it in GitHub Desktop.
Download ZIP
Raw
-
Applying: rename GLPainter to Painter
Using index info to reconstruct a base tree...
M js/render/painter.js
Falling back to patching base and 3-way merge...
Auto-merging js/render/painter.js
CONFLICT (content): Merge conflict in js/render/painter.js
Failed to merge in the changes.
Patch failed at 0025 rename GLPainter to Painter
The copy of the patch that failed is found in:
/Users/tmcw/src/mapbox-gl-js/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment