Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge conflict on hotfix-finish to develop branch #401

Open
Linkje opened this issue Feb 20, 2024 · 0 comments
Open

merge conflict on hotfix-finish to develop branch #401

Linkje opened this issue Feb 20, 2024 · 0 comments

Comments

@Linkje
Copy link

Linkje commented Feb 20, 2024

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?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant