Gitlab Ask to merge branch-A into development (3 commits behind), should I worry?

When creating a merge request in gitlab, I often get a message: Request to merge branch-A into development ([x] is delayed) what does the gitlab want to tell me? Should I worry or do I need to fix something (what)?

+4
source share
1 answer

After some time, the merge request is open in the project , it is normal that the version of the branch that you are trying to merge becomes outdated due to the fact that other people merge their changes into it.

Gitlab helps you by showing how far the version of the updated branch is behind the remote branch.

, rebase , . , , . , , , .

rebase , :

# Add a remote named `upstream` pointing to the original repository
git remote add upstream https://gitlab.example.com/example/your_project.git

# Fetch the latest commmits from `upstream`
git fetch upstream

# Checkout our branch-A
git checkout branch-A

# Rebase our branch on top of the `upstream/develop` branch
git rebase upstream/develop

# If needed fix any conflicts that may have appeared and then `git rebase --continue`  

# Push the changes to the branch of your merge request
git push --force origin branch-A

: , , .

+1

Source: https://habr.com/ru/post/1671224/


All Articles