Current Git structure
enter image description here
I created a ticket branch from the develop branch and made some changes. After the release, I merged my ticket branch with both the main and develop branches. Now, I need to provide a hotfix. I created a new branch from the main branch, made the necessary changes in the hotfix branch, and then merged it back into the main branch successfully. However, when merging the hotfix branch with the develop branch, I encountered an issue where two commit IDs appeared in one commit: one with changes from the hotfix and the other with changes from the last release commit.
Here is the rephrased version:
- Is the process I followed to provide the hotfix correct?
- Is there a standard method for providing a hotfix?
- Is it normal to get two commits when merging the hotfix into the develop branch?
Nikhil Rane is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.