internetguru / flow

Use Git Flow with ease – maintain branches, semantic versioning, releases, and changelog with a single command.
Other
41 stars 6 forks source link

Test merging hotfix with release branch #69

Closed petrzpav closed 1 year ago

petrzpav commented 7 years ago

We should add a test to check if hotfix is merged correctly with the release branch.

Situation:

omgf release # create release
omgf hotfix # create hotfix
# ... some fix
omgf # merge hotfix (into master, dev, release)