The Atlassian article has a diagram showing a hot fix branch going to both the main branch as well as to a dev branch.
The worry is whether this will change the history and if that hot fixed production code will be the same as what will live on in dev and be present in subsequent production branches.
Main questions I would like to answer:
Will that prod release and dev have the same commit history and hashes if we go with the way the Atlassian article suggests versus going from main -> dev?
Will it make any difference if we have merge conflicts and sorting them out going from the hot fix branch or main into dev?
The Atlassian article has a diagram showing a hot fix branch going to both the main branch as well as to a dev branch.
The worry is whether this will change the history and if that hot fixed production code will be the same as what will live on in dev and be present in subsequent production branches.
Main questions I would like to answer: