0

当我运行命令“mvn jgitflow:release-finish”时，出现类似“错误完成发布：错误完成发布：org.eclipse.jgit.api.errors.CheckoutConflictException：签出与文件冲突：”的错误。仅提交父 pom.xml 更改。儿童 poms 发生冲突。错误的原因是什么？如何解决这个错误？

谢谢你。

Git状态：

要提交的更改：

    modified:   pom.xml

未合并的路径：（使用“git add ...”标记分辨率）

    both modified:   csm-backend-ai/pom.xml
    both modified:   csm-backend-analytics/pom.xml
    both modified:   csm-backend-bpm/pom.xml
    both modified:   csm-backend-core/pom.xml
    both modified:   csm-backend-integration/pom.xml
    both modified:   csm-backend-schedule/pom.xml
    both modified:   csm-backend-web/pom.xml
    both modified:   csm-bpm-provider/csm-bpm-provider-api/pom.xml
    both modified:   csm-bpm-provider/csm-bpm-provider-camunda/pom.xml
    both modified:   csm-bpm-provider/pom.xml
    both modified:   csm-common/pom.xml
    both modified:   csm-integration-telaura/pom.xml

我的 pom.xml 中的插件

<plugin>
            <groupId>external.atlassian.jgitflow</groupId>
            <artifactId>jgitflow-maven-plugin</artifactId>
            <version>1.0-m4.3</version>
            <configuration>
                <pushFeatures>true</pushFeatures>
                <pushHotfixes>true</pushHotfixes>
                <pushReleases>true</pushReleases>
                <enableSshAgent>true</enableSshAgent>
                <noDeploy>true</noDeploy>
                <flowInitContext>
                    <masterBranchName>versiontest</masterBranchName>
                    <developBranchName>versiondev</developBranchName>
                    <featureBranchPrefix>feature/</featureBranchPrefix>
                    <releaseBranchPrefix>release/</releaseBranchPrefix>
                    <hotfixBranchPrefix>hotfix/</hotfixBranchPrefix>
                    <versionTagPrefix>${project.artifactId}-</versionTagPrefix>
                </flowInitContext>
                <scmCommentPrefix>JgitFLow step: </scmCommentPrefix>
                <pullDevelop>true</pullDevelop>
                <pullMaster>true</pullMaster>
                <squash>false</squash>
                <allowSnapshots>true</allowSnapshots>
                <allowUntracked>true</allowUntracked>
                <autoVersionSubmodules>true</autoVersionSubmodules>
            </configuration>
        </plugin>

只有 Child pom 存在冲突：[1]：https ://i.stack.imgur.com/ZqFPU.png

4

0 回答 0