Created
September 12, 2019 13:26
Star
You must be signed in to star a gist
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
| ~/code/projects/euregias/ git am -p2 --directory euregias < 0001-add-missing-role_id-to-request.patch | |
| Applying: add missing role_id to request | |
| error: patch failed: euregias/frontend/src/bbpf.js:1082 | |
| error: euregias/frontend/src/bbpf.js: patch does not apply | |
| Patch failed at 0001 add missing role_id to request | |
| hint: Use 'git am --show-current-patch' to see the failed patch | |
| When you have resolved this problem, run "git am --continue". | |
| If you prefer to skip this patch, run "git am --skip" instead. | |
| To restore the original branch and stop patching, run "git am --abort". | |
| (amnesiabbpf) █▓▒░jcigar@dev█▓▒░ Thu Sep 12 03:25:54P | |
| ~/code/projects/euregias/ git status | |
| On branch dev | |
| Your branch is ahead of 'origin/dev' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| You are in the middle of an am session. | |
| (fix conflicts and then run "git am --continue") | |
| (use "git am --skip" to skip this patch) | |
| (use "git am --abort" to restore the original branch) | |
| Untracked files: | |
| (use "git add <file>..." to include in what will be committed) | |
| 0001-add-missing-role_id-to-request.patch | |
| static_builds/ | |
| nothing added to commit but untracked files present (use "git add" to track) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment