You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
I'm new to both axion-release-plugin and GitLab CI and facing issue when multiple commits are merged into the main branch.
From what I understand, the REJECTED_NONFASTFORWARD error occurs when trying to push changes to a remote Git repository. This indicates that the remote branch has diverged from the local branch, and Git cannot perform a fast-forward merge.
In our GitLab setup, the merge method is set to Merge commit.
Scenario
When two commits are merged consecutively:
The second commit doesn't include changes from the first commit.
The first commit correctly increments the tag version.
However, the second commit's tag increment fails with the REJECTED_NONFASTFORWARD error.
Here is the release stage (Gitlab pipeline) logs for the second commit:
Starting the release process for 1.2.0-SNAPSHOT...
gradle release command invoked successfully.
> Task :verifyRelease
Skipping uncommitted changes check
Skipping ahead of remote check
Skipping snapshot dependencies check
remote status: REJECTED_NONFASTFORWARD
remote message:
> Task :release FAILED
Creating tag: v1.2.0
FAILURE: Build failed with an exception.
* What went wrong:
How can I make sure that 2nd commit know about the tag which is being created by the 1st merge commit.
Thank you.
The text was updated successfully, but these errors were encountered:
I'm new to both axion-release-plugin and GitLab CI and facing issue when multiple commits are merged into the main branch.
From what I understand, the REJECTED_NONFASTFORWARD error occurs when trying to push changes to a remote Git repository. This indicates that the remote branch has diverged from the local branch, and Git cannot perform a fast-forward merge.
In our GitLab setup, the merge method is set to Merge commit.
Scenario
When two commits are merged consecutively:
Here is the release stage (Gitlab pipeline) logs for the second commit:
How can I make sure that 2nd commit know about the tag which is being created by the 1st merge commit.
Thank you.
The text was updated successfully, but these errors were encountered: