Stack Overflow
Stack Overflow

Questions tagged [merge-request]

114 questions
1
vote
1 answer

Resolve git conlfict with a merge request instead of pushing directly to branch

I have a question about a problem when merging branches after resolving conflict in Gitlab. The conflict is not the issue in itself but I fail to understand what is happening under the hood. The setup is the following: I have two long lived branch…
David Bowman
  • 11
  • 3
1
vote
1 answer

On Gitlab, is there a commonly used procedure, similar to a Merge Request, for changes that rewrite the git history?

Something we could call a "Reset Request", because instead of requesting to merge the feature branch into master, we'd be requesting to reset master to the feature branch. The use-cases for this would be for instance to clean up the git history…
LoneCodeRanger
  • 413
  • 6
  • 18
1
vote
1 answer

Is it possible to run a gitlab pipeline job only once, when a merge request is created?

Is it possible to configure a job in a gitlab pipeline to only run once, when a merge request is created? Using the rule " '$CI_PIPELINE_SOURCE == "merge_request_event"' " does not work, as it will also be triggered when there are new commits to…
laoal11
  • 19
  • 1
1
vote
0 answers

looking for svn merge request application like gitlab or github that can support new merge request and do merge by the repo maintainer

Are there any open source softwares that can support such function? here is my svn management requirements: a developer call Mike commits sth to A branch Mike creates a new merge request,which source branch is A and target branch is B the…
madwolf
  • 19
  • 2
1
vote
1 answer

Generate GitLab Merge Request when a push comes in via CI/CD Pipeline using Bash and cURL

So, I've been beating my head around this for a few days and could use some help. Initially, I found the gitlab blog post from 2017: https://about.gitlab.com/blog/2017/09/05/how-to-automatically-create-a-new-mr-on-gitlab-with-gitlab-ci/ However it…
ZenOokami
  • 212
  • 2
  • 4
  • 12
1
vote
1 answer

disable gitlab pipeline after merge request is accepted

I have this problem that whenever a merge request is accepted some pipelines start to run. We also have the same pipeline for pushing a branch to GitLab and also creating a new merge request. This is my job : build: stage: build script: -…
Hani Bikdeli
  • 23
  • 1
  • 7
1
vote
1 answer

Number of approvers setting for Merge Request in Group Level

In my organization, I would like to set mandatory merge request for all the projects merging into master branch. so, Number of Approvers required should be greater than 0 is what I would like to set for all projects. However, It is tedious and a…
nagasaiii
  • 11
  • 1
1
vote
0 answers

Gitlab duplicate pipelines for merged results and merge train

When I enable both merged results pipeline and merge trains, two pipelines will be triggered, one for merged results and the other for merge train. My question is that, why do we even bother waste time to run the one for merge results? Because the…
Bruce Jeaung
  • 11
  • 2
1
vote
1 answer

Why am I not seeing PR/MR comments?

Why can I not see PR/MR comments on my CI platform? I have created my CI config file correctly as well as I have installed the Semgrep app onto my organization. I am able to get email notifications working but not with the others.
Jason
  • 81
  • 6
1
vote
1 answer

Reverting to previous MR and incorporating from select future commits already in main branch

Some dependencies we merged into our main are now proving to have many downstream impacts. At this point, the MR that updated these dependencies is previous to several newer MRs. So if I have MR's as such: 336! 337! 338! I need to revert to 336!…
Hofbr
  • 868
  • 9
  • 31
1
vote
0 answers

GitLab CI pipeline with failed job shows as "waiting for manual action" instead of "failed"

On commit 6daa4065 there are two jobs, build binaries and build manual binaries. The first job runs for the main branch and tags. The second branch runs for all other refs but is manual. The status of the commit is "Pipeline #500045869 failed". On…
Ethan Reesor
  • 2,090
  • 1
  • 23
  • 40
1
vote
1 answer

Is there a way to check for a gitlab merge request approval status and then trigger the next stage in CI

I have a stage1 where it creates a merge request then after the merge request is approved by 3 approvers I manually trigger the stage2. But, I want to find a way where I can check the merge request approval status created in stage1 and trigger the…
Vardhan
  • 11
  • 3
1
vote
0 answers

Is there an HTML linter that will make sure attributes are aligned properly on an element?

Is there any type of command line HTML linter that I can use to enforce that attributes are aligned properly? We have a code standard that says you can NOT do this: