GitFlow.VS icon indicating copy to clipboard operation
GitFlow.VS copied to clipboard

Finishing a release does not pull latest changes first

Open raymondbrink opened this issue 6 years ago • 0 comments

I run into an issue when I want to finish a release, but someone else pushed a commit to origin/develop, just after I created my release branch. In this case the finish results in a FATAL error and a useless local git state.

The process, if I understand it correctly, is to finish into local/master and back-merge to local/develop. This is fine, unless local/develop has become outdated in the meanwhile, because then the push to origin/develop will fail. Hence the FATAL error.

This can easily be fixed, if GitFlow would pull both master and develop, just before it starts the back-merge.

raymondbrink avatar Jan 09 '19 10:01 raymondbrink