Error finishing release: Error releasing: local branch 'develop' is behind the remote branch

1,261 views
Skip to first unread message

Andreas Lüdeke

unread,
Jul 19, 2013, 3:10:45 AM7/19/13
to maven-jgit...@googlegroups.com
Hi,

i am currently in the process of testing the maven git flow plugin for our release process and the results are really promising. We reduced the release time from about 30min to < 10min, which is very impressive.

I currently experience the issue the following issues:

Error finishing release: Error releasing: local branch 'develop' is behind the remote branch.
...
Caused by: com.atlassian.jgitflow.core.exception.BranchOutOfDateException: local branch 'develop' is behind the remote branch
	at com.atlassian.jgitflow.core.AbstractGitFlowCommand.requireLocalBranchNotBehindRemote(AbstractGitFlowCommand.java:179)
	at com.atlassian.jgitflow.core.ReleaseFinishCommand.call(ReleaseFinishCommand.java:122)
	at com.atlassian.maven.plugins.jgitflow.manager.DefaultFlowReleaseManager.finishRelease(DefaultFlowReleaseManager.java:227)
	... 31 more

My expection would be that the maven plugin pulls all changes and tries to merge them automatically before releaseing. Isn't that the case do i need to trigger the pull manullay before release finish?

Best Regards

Andreas

Jonathan Doklovic

unread,
Jul 26, 2013, 4:59:38 PM7/26/13
to maven-jgit...@googlegroups.com
Currently the plugin does not do a pull for you. We may or may not add the option in the future... it would definitely complicate things if there are merge conflict during the initial pull.
Reply all
Reply to author
Forward
0 new messages