Using gitflow for hotfixes where do I actually create the release build from?

Question

0.00/5 (No votes)

See more:

So I just wanted to clarify when and where a hotfix build (physical .DLL/.exe file) is created from when using GitFlow.

We need to fix an urgent bug in production so we've branched off master into a hotfix branch. We've fixed the bug in the hotfix branch and created a build from the hotfix branch for the testers to use.

The testers have okayed the fix and we want to get it into production.

Do we release the same .exe/.DLL file that the testers were given and tested and then merge everything into master...

Or do we merge everything to master first and build the .Exe/.DLL from that branch. Ensuring only master branch builds are the only releases in production.

I question it because we use pull requests to enforce code reviews when pushing changes back to the server. A hotfix would only get code reviewed when a pull request was issued for merging it back into master.

So my thoughts are that released should only be built from the master branch.

What I have tried:

We are currently building and releasing from master only but some of the team feel that we should be building and releasing from the hotfix branch.

Posted 12-Jun-19 21:04pm

Gareth Parris

Add a Solution

Comments

RickZeeland 13-Jun-19 3:31am

I'm not a GitFlow expert, but I guess that depends on which CI system you are using, some have poor GitFlow support.
We are using "Trunk based development" btw. see: https://trunkbaseddevelopment.com/
If even Google uses it, it must be good enough for us :)

Add your solution here

Treat my content as plain text, not as HTML

Preview 0

…

Existing Members

Sign in to your account

...or Join us

Download, Vote, Comment, Publish.

Your Email
Password
Forgot your password?

Your Email
This email is in use. Do you need your password?
Optional Password

I have read and agree to the Terms of Service and Privacy Policy
Please subscribe me to the CodeProject newsletters

When answering a question please:

Read the question carefully.
Understand that English isn't everyone's first language so be lenient of bad spelling and grammar.
If a question is poorly phrased then either ask for clarification, ignore it, or edit the question and fix the problem. Insults are not welcome.
Don't tell someone to read the manual. Chances are they have and don't get it. Provide an answer or move on to the next question.

Let's work to help developers, not make them feel stupid.

This content, along with any associated source code and files, is licensed under The Code Project Open License (CPOL)