aleksandr-m / gitflow-maven-plugin

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.

https://aleksandr-m.github.io/gitflow-maven-plugin/

Missing backmerge with gitlow:release goal

alexist opened this issue a year ago · comments

Alexis Thaveau commented a year ago

Hi,

The goal gitflow:release doesn't back merge into develop after tag is created.

The main issue is develop branch doesn't contains tag.

Release-finish and hotfix-finish do a back merge :
https://github.com/aleksandr-m/gitflow-maven-plugin/blob/master/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java#L313

https://github.com/aleksandr-m/gitflow-maven-plugin/blob/master/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowHotfixFinishMojo.java#L327

Is it possible to add back merge option in this goal ?

Aleksandr Mashchenko commented a year ago

How it will look like? PR-s are welcome. :)

Alexis Thaveau commented a year ago

The PR #375 has been tested manually and in a CI/CD pipeline.

@aleksandr-m can you review the PR ?

Aleksandr Mashchenko commented a year ago

1.20.0 is out.