Skip to content

Instantly share code, notes, and snippets.

@bdbaddog
Created June 1, 2017 16:58
Show Gist options
  • Save bdbaddog/5f729c1d6322bbdfc1c16cb0dd253c12 to your computer and use it in GitHub Desktop.
Save bdbaddog/5f729c1d6322bbdfc1c16cb0dd253c12 to your computer and use it in GitHub Desktop.
git rebase output.
Applying: Add file encoding to avoid error when opening the file while running under SCons which doesn't propagate LANG from the environment
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