error: Your local changes to the following files would be overwritten by merge: package.json Please commit your changes or stash them before you merge. Aborting Merge with strategy ort failed. 16:54:13.380: [soybean-admin] git -c core.quotepath=false -c log.showSignature=false restore --sta...
(merge d30126c20d en/merge-ort-renorm-with-rename-delete-conflict-fix later to maint). * "git stash apply" forgot to attempt restoring untracked files when it failed to restore changes to tracked ones. (merge 71cade5a0b en/stash-df-fix later to maint). * Calling dynamically loaded func...
[--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"), "git notes merge --commit [-v | -q]", "git notes merge --abort [-v | -q]", N_("git notes [--ref <notes-ref>] remove [...]"), N_("git notes [--ref <notes-ref>] prune [-n] [-v]")...