Skip to content

Instantly share code, notes, and snippets.

@tmcw

tmcw/-

Created June 2, 2015 20:01
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/7539c90405a85845fd4c to your computer and use it in GitHub Desktop.
Save tmcw/7539c90405a85845fd4c to your computer and use it in GitHub Desktop.
Download ZIP
Raw
-
~/src/mapbox-gl-js〉g rebase --continue
Applying: rename GLPainter to Painter
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this 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