Questions tagged [pull-request]

Pull requests are made when a developer forks a project, makes changes, and then wants those changes to be included in the main project again. These were made popular by Github and Bitbucket.

2166 questions
0
votes
1 answer

How to resolve confict on intelliJ?

I made a pull request on intelliJ and i got some conflicts. I don't know how to resolve it from intelliJ. I looked for the 'conflicts' window but without success, it doesn't want to open. On github in the 'pull request' section, the 'resolve…
HAD.java
  • 9
  • 1
0
votes
0 answers

Github Pull Request Procedure for adding more changes during a PR

If I submit a pull request to Github with some changes.. And then someone edits those changes.. And I approve those changes to my PR.. And then want to make one more change to the same file.. If I go to edit the file (on the patch branch), I can…
timhc22
  • 7,213
  • 8
  • 48
  • 66
0
votes
0 answers

'Reset status with changes' is resetting on every merge conflict

We have a PR release process (classic) that runs tests and posts a status when it completes. PRs without conflicts are completing and merging in successfully, but PRs with conflicts are failing to merge since last week. After resolving conflicts and…
0
votes
0 answers

GitHub not showing changes on pull request

I have a branch that I want to merge into the develop branch, let's call it feature-branch. I've made changes to one file and opened a PR on GitHub. When viewing the PR, the diffing shows "0 files changed". Viewing the same file on the two…
0
votes
0 answers

What type of merging/release strategy to follow in Git/GitHub with multiple deployment branches?

I have 3 types of branches in my GitHub repo. main -> deploys to production environment staging -> deploys to staging environment develop -> is the branch where most of the PRs are created to When anyone works on the project they create a feature…
0
votes
1 answer

Azure DevOps - Check out current repo in PR triggered SecretScan pipeline

We would like to do SecretScan as part of PRs when feature branches are merged / PRed into dev. I was thinking to have the SecretScan pipeline yaml stored in a shared Azure DevOps Project/Repository. Add the SecretScan pipeline in each of our…
objectclass
  • 154
  • 1
  • 3
  • 13
0
votes
1 answer

Reverting a Pull Request Description

Is there any way to revert the description of a pull request to its original version after changing it using REST API assuming that it had never been completed, and it is still in its "active" mode?
Rebel
  • 472
  • 8
  • 25
0
votes
3 answers

How to create multiple Pull requests for the same changes on multiple branches

Let's say we have three different branches: Main Branch - Here the developer pushes new code changes for new features Release Branch - This is the Production Branch Demo Branch - This branch is used to demonstrate new features to the customers. So…
Arpit Jain
  • 1,599
  • 9
  • 23
0
votes
1 answer

Unknown annotations in Azure DevOps Pull Request files tab

I was reviewing a pull request in our Azure DevOps instance and I noticed that in the Files tab some lines of code were annotated with flags, checkmarks and exclamation marks (see screenshot). I wasn't able to figure out what they mean. Hovering…
LeonZandman
  • 3,054
  • 6
  • 29
  • 26
0
votes
0 answers

Issue when pull request on GitHub

Commit Merge branch dev from my-branch 2 pull requests from my-branch to dev and master branch Hi everyone, I have problem when pull request from my branch to dev and master branch. It was occured 1 commit is Merge branch dev into my branch - I…
Tri Vu
  • 1
  • 1
0
votes
1 answer

Merging Pull requests from a sub-branch, particularly on Azure DevOps

Suppose the following happens in an Azure DevOps, GIT environment Developer 1 creates "Branch A" from "master" to work on a bug. Developer 2 creates "Branch B", from "Branch A" to do some extra work for Developer 1 When the Developer 2 is done, he…
Joe
  • 5,394
  • 3
  • 23
  • 54
0
votes
0 answers

How to re-review changes to a pull request after a review on github?

I am the reviewer for a pull request on github and would like advice on how to review revisions to pull requests. They submitted a pull request. I received it and made 20 comments, then the other party pushed commits addressing these comments. How…
LemonPi
  • 1,026
  • 9
  • 22
0
votes
1 answer

How can we set, to trigger a Jenkins job when a Pull request is created from Gitlab using Jenkinsfile

I don't want to use the webhook option in Gitlab. also the Jenkins job should be automatically triggered when the pull request is created. i Tried as per this -…
0
votes
0 answers

Are there any docs on how you envision the data engineer workflows looks like with Mage?

We run several environments with different data residency so would like to follow a declarative gitops workflow if possible. Essentially data engineers writes new pipeline in mage and creates a PR, the PR gets merge and deployed to all Mage…
datacated
  • 1
  • 2
0
votes
2 answers

How to NOT run a GitHub Action when a specific label is set?

I have a GitHub Action workflow that runs to deploy a preview of a react-native expo app always when a Pull Request is opened. However, I do not want it to run when the dependabot opens a Pull Request. How can I filter the dependabot Pull Requests?…