M
M
My joy2019-02-08 15:03:24
git
My joy, 2019-02-08 15:03:24

How to make a quick hotfix in production?

Hi friends!
there is a main branch master. I throw commits there, and then once a week they are dragged into production (after verification). and here the situation suddenly happens when you need to change something on the production (emergency edit) and at the same time not delay the usual commits in the master that have not yet been verified. as far as I remember it is called hotfix. how should I proceed in this case?
As I understand it, you need to create a new branch, for example, hotfix, make edits in it, then publish this branch, and switch to it on the prod. and then pull the changes from it to the master branch. so that I can continue to work with the master branch, and then in the future, when pulling changes from the master to the production, there were no conflicts.
Show clearly (command line) how I can make an urgent edit in this case.

Answer the question

In order to leave comments, you need to log in

2 answer(s)
I
Ivan Shumov, 2019-02-08
@inoise

Read about gitflow

V
Vitsliputsli, 2019-02-08
@Vitsliputsli

Master = production, what is in master must be in production, there cannot be any unchecked commits in master, otherwise it is no longer master. So rethink your work with git. And, as correctly noted, read about gitflow, IMHO, the optimal branching system.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question