The Git-Flow Maven Plugin supports various Git workflows, including GitFlow and GitHub Flow. This plugin runs Git and Maven commands from the command line.
We have noticed that when you use the the hotfix-finish command we get a merge conflict on all pom files
[ERROR] Failed to execute goal com.amashchenko.maven.plugin:gitflow-maven-plugin:1.20.0:hotfix-finish (default-cli) on project reactor: hotfix-finish:
[ERROR] Auto-merging parent/pom.xml
[ERROR] CONFLICT (content): Merge conflict in parent/pom.xml
We saw that the outputTimestamp was different in develop vs the hotfix branch but even when we disable updating the outputTimestamp we see the same behaviour.
Skipping the backmerge to develop and creating a seperate PR to develop fixes our workflow for now. Any suggestions what would cause this?
Hi,
We have noticed that when you use the the hotfix-finish command we get a merge conflict on all pom files
[ERROR] Failed to execute goal com.amashchenko.maven.plugin:gitflow-maven-plugin:1.20.0:hotfix-finish (default-cli) on project reactor: hotfix-finish: [ERROR] Auto-merging parent/pom.xml [ERROR] CONFLICT (content): Merge conflict in parent/pom.xml
We saw that the outputTimestamp was different in develop vs the hotfix branch but even when we disable updating the outputTimestamp we see the same behaviour.
Skipping the backmerge to develop and creating a seperate PR to develop fixes our workflow for now. Any suggestions what would cause this?