How to keep a thread up to date?

N

nuclear_kote2016-09-01 12:29:48

git

nuclear_kote, 2016-09-01 12:29:48

Sorry for the possibly dumb question.
There are 2 branches, let's say stable (only editing critical bugs is possible) and dev (new functionality is being developed). How to keep dev up to date with respect to stable?

Reply

Answer the question

In order to leave comments, you need to log in

2 answer(s)

B

bkosun, 2016-09-01
@bkosun

Like this:
Hotfix branches can originate from master and must be merged into develop and master. More details here: https://habrahabr.ru/post/106912/

F

fetis26, 2016-09-01
@fetis26

You make a bugfix branch from stable (by the way, call it master as it is generally accepted), fix the bug, then merge this branch into both dev and stable.