Z
Z
zencd2020-02-04 01:03:25
git
zencd, 2020-02-04 01:03:25

How to organize a workflow with periodic copying of one git branch to another?

Such a workflow:
1) there is a release-branch (few commits) and dev(many commits);
2) from time to time, a volitional decision is made that it devis good enough and its contents are copied into release, after which both branches become identical , regardless of any conditions;
3) after that, work continues in both branches: where more, where less.

Question: how to organize this? (In terms of git commands.)

It would be possible to periodically merge devin release, but I don’t want to get surprises like "nothing to merge" (false in this context), so, I suppose, the banal merge is no longer needed.

PS I hope the workflow isn't too offensive; I propose to take it for granted.

Answer the question

In order to leave comments, you need to log in

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question