J
J
Jekson2020-03-05 15:41:29
git
Jekson, 2020-03-05 15:41:29

Choosing the Right Branching Strategy?

Tell me how to do it right. there is a develop branch on the locale, when I add new functionality, I create the feature/new_name1 branch. I commit the changes and upload them to gitlab in a branch with the same name.
git push origin feture/new_name1
Now there is a condition that I can only push changes to the develop branch on locale through a merge request through the gitlab interface, but the merge still needs to be approved. In anticipation of the approval, I want to make another functional on LAN.
From now on, what is the course of action? It turns out that the local developer is not updated. Here I see two more nuances:
1 - when the new functionality depends on the code in the feature/new_name1 branch
2 - the functionality does not overlap

In general, how to branch correctly?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
R
res2001, 2020-03-05
@Lepilov

Makes a new branch from feture/new_name1 and make other functionality based on it.
After the feture/new_name1 branch is accepted, you can push the new branch to gitlab.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question