Maven release plugin with git, error if commits are pushed during the process

Question

We use the git repository plugin and maven release. At the first stage of the assembly, we transfer all the changes to the local repository, and at the next stage - mvn release:prepare release:perform . release:prepare updates the workspace, updates the version in pom files, creates a tag in the repository, runs all tests, builds banks, etc. If everything is in order, it then transfers the changes of the local repository to the remote one (updated poms and created tag).

The problem is that when someone pushes some changes, then pressing with maven fails. Error message:

 error: failed to push some refs to 'http://<my_repository>' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. 

Has anyone had a similar problem? How to solve it?

Answer 1

Take a look at pushChanges :

 <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> <configuration> <pushChanges>false</pushChanges> </configuration> </plugin> 

... and click later