Skip to content
This repository has been archived by the owner on Jun 19, 2023. It is now read-only.

Feature/add nodevelopmerge to hotfix finish #450

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

chenjianjx
Copy link

@chenjianjx chenjianjx commented Jan 7, 2021

Hi,

The flag "nodevelopmerge" has been added to "release finish". Now I added it to "hotfix finish" as well.

This is almost mandatory if the hotifx is run using some web console such as gitlab ci/cd pipeline ,because

  • The changes in a hotfix can easily cause a merge conflict when it's merged to develop. The hotfix branch is based from "master" branch, which is normally behind "develop" branch, so merge conflict can easily happen.
  • You can fix the merge conflict if you are just running git flow on your local computer. But if it's run on a web console, there is no way to fix the conflict and the job on the console will just fail.

The change is similar to one made for release finish: #317

Hopefully this can be accepted

@ChrisJStone
Copy link

I'm in the process of updating gitflow. If you could kindly resubmit your pull request against my fork here as it appears this fork is no longer being updated.

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

Successfully merging this pull request may close these issues.

2 participants