git rev-parse --is-inside-work-tree Fetching changes from the remote Git repository git config remote.origin.url http://git.chorem.org/pollen.git Fetching upstream changes from http://git.chorem.org/pollen.git git --version git fetch --tags --progress http://git.chorem.org/pollen.git +refs/heads/master:refs/remotes/origin/devel git rev-parse remotes/origin/devel^{commit} Checking out Revision a1edf8151d1852622dd6fd94dd4bf2d551344e3c (remotes/origin/devel) git config core.sparsecheckout git checkout -f a1edf8151d1852622dd6fd94dd4bf2d551344e3c git branch -a git rev-parse devel^{commit} git rev-parse remotes/origin/devel^{commit} git rev-parse remotes/origin/master^{commit} git rev-parse remotes/origin/pollen-1.x^{commit} git branch -D devel git checkout -b devel a1edf8151d1852622dd6fd94dd4bf2d551344e3c FATAL: Could not checkout devel with start point a1edf8151d1852622dd6fd94dd4bf2d551344e3c hudson.plugins.git.GitException: Could not checkout devel with start point a1edf8151d1852622dd6fd94dd4bf2d551344e3c at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$8.execute(CliGitAPIImpl.java:1479) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:896) at hudson.model.AbstractProject.checkout(AbstractProject.java:1252) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:604) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:513) at hudson.model.Run.execute(Run.java:1706) at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:529) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:231) Caused by: hudson.plugins.git.GitException: Command "git checkout -b devel a1edf8151d1852622dd6fd94dd4bf2d551344e3c" returned status code 1: stdout: pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java: needs merge

See <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/531/> ------------------------------------------ Started by user CI Chorem Admin Building in workspace <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/> pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/I18nAble.java: needs merge pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java: needs merge pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java: needs merge pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java: needs merge pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java: needs merge pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java: needs merge pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java: needs merge pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties: needs merge pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties: needs merge pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java: needs merge pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java: needs merge pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml: needs merge pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java: needs merge pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriAware.java: needs merge pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java: needs merge pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java: needs merge pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenUserSecurityAware.java: needs merge pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java: needs merge pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/package-info.java: needs merge pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/package-info.java: needs merge pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayDateChoice.java: needs merge pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayImageChoice.java: needs merge pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/package-info.java: needs merge pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ModeratePoll.java: needs merge pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java: needs merge pollen-ui-struts2/src/main/resources/pollen.properties: needs merge pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js: needs merge stderr: error: you need to resolve your current index first at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1307) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1283) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1279) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1084) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1094) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$8.execute(CliGitAPIImpl.java:1472) ... 9 more