NoneFirst, rewinding head to replay your work on top of it...
Applying: Update eventquest.js
.git/rebase-apply/patch:29: trailing whitespace.
.git/rebase-apply/patch:38: trailing whitespace.
.git/rebase-apply/patch:43: trailing whitespace.
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
A js/web/eventquest/js/eventquest.js
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): js/web/eventquest/js/eventquest.js deleted in HEAD and modified in Update eventquest.js. Version Update eventquest.js of js/web/eventquest/js/eventquest.js left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Update eventquest.js
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
(1)
3 months ago
thepab