即使所有更改都是在没有合并冲突的情况下推送的，合并时也会出现 Git 错误

Question

在推送我的更改后，我在 Jenkins 构建上看到了一些有关 git 的错误。我将尝试在这里解释这个场景：

在这里，我正在处理我的本地分支 - develop，它是从 ma​​ster 分支克隆的。

• 我对我的开发分支做了一些更改将更改推送到主分支。
• 我在Stash上看到了一些合并冲突。
• 因此，我使用 master 将 master 拉入我的开发分支

git pull origin master

• 解决冲突后，我推送了更改，但在我的构建管道中遇到了这个问题。我在本地以及 Stash 的 UI 中看不到任何冲突问题。
• 我看不到任何需要在本地提交的更改，使用命令进行验证，但它没有显示任何抢占的更改

git 状态

错误消息

[2022-03-04T20:02:25.315Z] ERROR: Checkout failed

[2022-03-04T20:02:25.315Z] hudson.plugins.git.GitException: Command "git merge 7b22e11d41ecfcc22ce4bf5e3f7d9948fc3be363" returned status code 128:

[2022-03-04T20:02:25.315Z] stdout: 

[2022-03-04T20:02:25.315Z] stderr: error: 'merge' is not possible because you have unmerged files.

[2022-03-04T20:02:25.315Z] hint: Fix them up in the work tree,

[2022-03-04T20:02:25.315Z] hint: and then use 'git add/rm <file>' as

[2022-03-04T20:02:25.315Z] hint: appropriate to mark resolution and make a commit,

[2022-03-04T20:02:25.315Z] hint: or use 'git commit -a'.

[2022-03-04T20:02:25.315Z] fatal: Exiting because of an unresolved conflict.

[2022-03-04T20:02:25.315Z] 

[2022-03-04T20:02:25.315Z]  at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2671)

[2022-03-04T20:02:25.315Z]  at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2096)

[2022-03-04T20:02:25.315Z]  at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1996)

[2022-03-04T20:02:25.315Z]  at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1987)

[2022-03-04T20:02:25.315Z]  at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$600(CliGitAPIImpl.java:84)

[2022-03-04T20:02:25.315Z]  at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:955)

[2022-03-04T20:02:25.315Z]  at jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild(MergeWithGitSCMExtension.java:121)

[2022-03-04T20:02:25.315Z]  at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1164)

[2022-03-04T20:02:25.315Z]  at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1303)

[2022-03-04T20:02:25.315Z]  at org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:129)

[2022-03-04T20:02:25.315Z]  at org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition.create(CpsScmFlowDefinition.java:154)

[2022-03-04T20:02:25.315Z]  at org.jenkinsci.plugins.workflow.multibranch.SCMBinder.create(SCMBinder.java:145)

[2022-03-04T20:02:25.315Z]  at org.jenkinsci.plugins.workflow.job.WorkflowRun.run(WorkflowRun.java:310)

[2022-03-04T20:02:25.315Z]  at hudson.model.ResourceController.execute(ResourceController.java:99)

[2022-03-04T20:02:25.315Z]  at hudson.model.Executor.run(Executor.java:432)

[2022-03-04T20:02:25.315Z] ERROR: Maximum checkout retry attempts reached, aborting

提前致谢！