Questions tagged [merge-request]
114 questions
0
votes
0 answers
Unexpectedly changes in MR
in Gitlab:
Created a new branch called xxx from prod.
Coding in the XXX（2 changes）
Created a new branch called merge_XXX_dev from dev.
Pull from XXX to merge_XXX_dev and commit the changes（2 changes）
Created a MR (merge_XXX_dev to dev)…
chen0814
- 1
0
votes
1 answer
Gitlab Option to create branch/merge request for issue automatically
Is there an option in GitLab which enables feature branch/merge request creation by default whenever an issue is created?
I know it is possible to create them manually by clicking that fancy button on the issue page, but let's face it, we're lazy...
Robert Kirsten
- 474
- 2
- 5
- 12
0
votes
1 answer
How do I modify the code of a merge request before merging in GitLab?
The scenario is as follows: A user has opened a merge request that adds a new feature to my code. Their code however contains a few bugs. I know how to fix the appropriate parts but I'd prefer keeping my repository free of code that has known…
Gecko
- 150
- 9
0
votes
2 answers
Is rebasing the best strategy to merge the branches
I have a parent branch and child branches.
when I want to merge a child branch into a parent branch , it's said that Re-basing the branch is the best way to merge.
If we're rebasing all the changes made in the other branch will come into the…
Dan Ram
- 171
- 1
- 14
-1
votes
1 answer
Draft merge request in GitLab is two commits behind--click "Mark as ready", or pull/rebase first?
I need your help to determine the correct order events I should follow before I perform a specific type of merge in GitLab. I have a "Draft" merge request which has the prefix "Draft:" in its title, but has been approved by all its required code…
ShieldOfSalvation
- 1,297
- 16
- 32
-1
votes
2 answers
Gitlab-PythonApi Merge request
How to check the merge request status in GitLab using a python API call, I want to check the status of approval before merging, based on the status of approval have to do some checks, once checks are approved then merge will takes place
import…
shahbaz
- 1
- 1
- 1
-1
votes
1 answer
Git Rebase Infinity Loop
Scenario: I have two branches: develop and feature_xyz. I'm integrating feature_xyz into develop via merge request in Gitlab but I'm facing a non fast-forward scenario so I must rebase develop into feature_xyz locally and then push and request…
Idemax
- 2,712
- 6
- 33
- 66
-3
votes
0 answers
Warnings in manifest
I am getting the "Manifest merger failed with multiple errors, see logs" error and when I look up the Merged Manifest logs I get these warning (pls see the screenshot).
I am just trying to update the webview app as per Google requirement to meet…
Egor Ukoloff
- 1
- 2