Uploaded image for project: 'Maven JGit Flow'
  1. MJF-129

release-finish failed with CheckoutConflictException where 'git flow release finish' has no issue

    Details

    • Type: Bug
    • Status: Resolved
    • Priority: Major
    • Resolution: Timed out
    • Affects Version/s: None
    • Fix Version/s: None
    • Component/s: maven plugin
    • Labels:
      None
    • Environment:

      Mac OS X 10.9.2; Java 1.7.0_45; Maven 3.1.1; git 1.8.4.3; git-flow 0.4.1

      Description

      Finishing a release with version 1.0-alpha26 failed with the following error:

      [ERROR] Failed to execute goal com.atlassian.maven.plugins:maven-jgitflow-plugin:1.0-alpha26:release-finish (default-cli) on project sculptor-parent: Error finishing release: Error releasing: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files:
      [ERROR] sculptor-generator/sculptor-generator-core/src/main/java/org/sculptor/generator/template/RootTmpl.xtend
      [ERROR] sculptor-generator/sculptor-generator-core/src/main/java/org/sculptor/generator/template/service/ServiceEjbTestTmpl.xtend
      [ERROR] sculptor-generator/sculptor-generator-core/src/test/resources/generator-tests/trait/trait.btdesign
      

      The attached jgitflow.log shows the following:

      release-finish:     merging 'release/3.0.2' into master...
      release-finish:     ### Merge Result
      Merge of revisions f6d071f2eb31db05c76e9c68256f277303152339, 92481c34cee69ed03c3e19daf191195461de2363 with base 31b4cfd8079525dbaec21711adc84584e53ad08a using strategy recursive resulted in: Failed. 
      release-finish:     ** merge into master was not successful! Aborting the release... **
      release-finish:     ** until JGit supports merge resets, please run 'git reset --merge' to get back to a clean state **
      release-finish:     merging 'release/3.0.2' into develop...
      release-finish:     ** Checkout conflict with files: 
      sculptor-generator/sculptor-generator-core/src/main/java/org/sculptor/generator/template/RootTmpl.xtend
      sculptor-generator/sculptor-generator-core/src/main/java/org/sculptor/generator/template/service/ServiceEjbTestTmpl.xtend
      sculptor-generator/sculptor-generator-core/src/test/resources/generator-tests/trait/trait.btdesign **
      

      Finishing the release manually via git flow release finish 3.0.2 works like a charm. The corresponding console log is attached as well.

        Attachments

          Issue links

            Activity

              People

              • Assignee:
                Unassigned
                Reporter:
                tjuerge Torsten Juergeleit
              • Votes:
                3 Vote for this issue
                Watchers:
                8 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:

                  Who's Looking?