search

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/
Apache License 2.0
487 stars 180 forks source link

[release-finish] Add option to not merge into develop #368

Closed AdrienHorgnies closed 1 year ago

AdrienHorgnies commented 1 year ago

The main purpose of the new option skipMergeDevBranch is to allow the goal to finish without crashing in case of git conflict (assuming the developer enables the option after a first failure).

I wasn't sure how to interact with the option commitDevelopmentVersionAtStart, and I choose to let it do his usual thing.

I'm not sure if I must do something special about no noBackMerge. For example, if we are in a use case where the developer expects the release branch (not the tag, not master) to be merged into develop, should I fail the goal instead ? Because going forward, the goal may delete the release branch, and the developer will lose the opportunity to merge the release branch. That said, that can only happen if the developer deliberately chose to enable the new option, which clearly states nothing will be merged into the development's branch.

Related to #366

AdrienHorgnies commented 1 year ago

@aleksandr-m Any blocking points ?

sriram0721 commented 1 year ago

When can we expect this feature? @AdrienHorgnies

AdrienHorgnies commented 1 year ago

When can we expect this feature? @AdrienHorgnies

Well, I'm waiting for a review, but I think the author is focusing on other PRs.

sriram0721 commented 1 year ago

cool!. I believe this feature will be super useful as we don't directly merge to Develop.

Quick question, I'm trying to leverage Merge requests for Develop & Main branches after finishing the release. With skipMergeDevBranch and skipMergeProdBranch we can actually stop direct push to those branches. I see that we can create MR using git push options in gitlab. But what would be the base branch for the MR in this case. Any probable solution ? @AdrienHorgnies

AdrienHorgnies commented 1 year ago

@sriram0721 I have no idea, I'm not even using GitLab.

aleksandr-m commented 1 year ago

@AdrienHorgnies Can you fix naming and tests?

AdrienHorgnies commented 1 year ago

@AdrienHorgnies Can you fix naming and tests?

I'll wait for #379. Which requires some fixing too. It's fine locally but CI doesn't pass two tests which should pass.

AdrienHorgnies commented 1 year ago

@aleksandr-m Sorry, but I won't have time to finish any of the PR I started. My client moved away from gitflow-maven-plugin, and work is piling up, so I can't afford to allocate time to any of the PR I filled.

I opened:

If you liked any what's in the PR, feel free to fork / copy them, as I'll delete my fork in 2 weeks.

aleksandr-m commented 1 year ago

@AdrienHorgnies Thanks. I've created feature branches with your PR-s.