P
P
plr2019-09-17 21:16:26
git
plr, 2019-09-17 21:16:26

How to properly merge requests in gitlab?

Colleagues,
There are two branches in the private repository:

  • master
  • beta

In is masterforbidden (protected) git push, only merge.
CI / CD is configured for each of the branches equal to its environment.
Accordingly, we "bring" the branch betato the readiness of transferring it to production.
We do Merge Requestas a result of which a git commit is formed on master. Everything seems to be as it should be.
But I do not like that as a result Merge Requestthe branches are different and the same gitlab shows that it betastarts to lag behind mastereach git commitafter MR.
To do after merge from masterto betafor alignment - it seems dumb to me.
Tell me how to do it better, more efficiently, more correctly. Maybe not MR, maybe differently?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
D
Dmitry, 2019-09-17
@disappearedstar

There is nothing wrong with falling behind the master. If you need fresh code from the master in a feature branch and don't want to litter the history with merge commits, use git rebase.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question