我在与通常不同的机器上进行开发,并且git的行为似乎与我记得的不同。
当我签出新的branch git checkout -b <new branch name>并尝试应用补丁时git am </path/to/file.patch>,补丁无法应用:
</path/to/file.patch>
Applying: <commit msg>
error: patch failed: <filename>:<line no>
error: <filename>: patch does not apply
Patch failed at <commit msg>
The copy of the patch that failed is found in: .git/rebase-apply/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".
Run Code Online (Sandbox Code Playgroud)
现在,当补丁无法应用时,我会在其他机器上发誓,git …