An error 'Checkout conflict with files: generic/ ... tests/

JFrog JIRA | David Welsh | 2 years ago
Click on the to mark the solution that helps you, Samebug will learn from it.
As a community member, you’ll be rewarded for you help.
  1. 0

    When attempting to run the Release & Promotion step of a successful build that has a Artifactory Maven 3 task the build will fail if Symbolic Links are part of the git repository. The error will look like this: {noformat} Exception occurred while executing custom pre-build action 'org.jfrog.bamboo.release.action.ArtifactoryPreBuildAction@354a1t21'. Building will abort... An error 'Checkout conflict with files: generic/ ... tests/ at org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout( at org.eclipse.jgit.dircache.DirCacheCheckout.checkout( at ... 14 more {noformat} With the error occuring during checkout branch phase: {noformat} simple 20-Aug-2015 15:08:41 [RELEASE] Release Build Active simple 20-Aug-2015 15:08:41 [RELEASE] Checking out branch: release/sprint5 {noformat} I looked into it and extracted the plugin jar ({{bamboo-artifactory-plugin-1.7.6.jar}}) and viewed its pom.xml file ({{META-INF\maven\org.jfrog.bamboo\bamboo-artifactory-plugin\pom.xml}}) which showed me the following dependency information for JGit: {code:xml} <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> <version></version> <exclusions> <exclusion> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> </exclusion> </exclusions> </dependency> {code} Which from viewing [JGit Bug 354367|] this appears to be resolved as of version 3.7 which means the JGit dependency in the plugin requires updating in order for Symbolic Links to work within Git Repositories during the Release & Promition step.

    JFrog JIRA | 2 years ago | David Welsh An error 'Checkout conflict with files: generic/ ... tests/

    Root Cause Analysis

    1. An error 'Checkout conflict with files: generic/ ... tests/

      at org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout()
    2. JGit - Core
      1. org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout(
      2. org.eclipse.jgit.dircache.DirCacheCheckout.checkout(
      3 frames