Display "nothing to merge" if release is empty

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

Closed petrzpav closed 1 year ago

petrzpav commented 7 years ago

Current output of merging empty release into dev

{ test } release » omgf
* Merge 'release' branch into 'dev'? [YES/No] yes
[   ok   ] Merging 'release' into branch 'dev'

Proposed output

{ test } release » omgf
omgf[error]: Nothing to merge - 'dev' is up-to-date with 'release'
omgf[error]: Generic error occurred (see REPORTING BUGS).