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
0 answers

How can I git reset a file with pr?

I've submitted a pull request on GitHub but changed file A which should not be changed by mistake. Meanwhile, the original project I forked off may have been changed. How to keep my changed code and make the file A and other unchanged files the…
0
votes
0 answers

How to resolve "fatal: bad object refs/stash 2 error: https://github.com/example.git did not send all necessary objects" git error

% git pull remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (2/2), done. remote: Total 5 (delta 3), reused 5 (delta 3), pack-reused 0 Unpacking objects: 100% (5/5), 654 bytes |…
0
votes
0 answers

How can I update a pull request's checks with a manual workflow run?

similar to How can I attach a manual workflow run to a pull request's status checks? but the difference is that my manual workflow will run for the same branch I have a workflow that takes a long time to finish, so I made it into a manual workflow,…
dontloo
  • 10,067
  • 4
  • 29
  • 50
0
votes
0 answers

How can I create a newline without changing more than one line?

There is a GitHub repo created by the startup company Olivr that allows a free subdomain to be used. The check script is: name: Automerge PR on: pull_request_target: paths: - "zones/*.yaml" jobs: check: runs-on: ubuntu-latest …
NotM1zzel
  • 1
  • 1
0
votes
1 answer

How to resolve a merge conflict

I got a merge conflict in multiple files when I tried a pull request in a github repo. While I know how to resolve merge conflicts in a normal case, my situation seems more convoluted. Master branch: The Master to which I am merging has no…
0
votes
0 answers

Azure DevOps Diff Syntax Highlighting

We use Oracle for our databases so have a lot of .pak and .bod files in our Azure Repo. Currently, when you create a pull request the diff view will show it with no syntax highlighting. I'm trying to get ADO to treat them as .sql files as they are…
HandsDown
  • 23
  • 1
  • 3
0
votes
1 answer

GitHub Workflow - get the path that triggered a pull request

I am working on a mono repository that contains multiple projects, each solution being in a different folder. What I'm trying to achieve is to run a scan action on a folder if changes were made to code in that folder. I thought of setting all the…
Chris
  • 1
  • 3
0
votes
0 answers

Set PR to autocomplete using Azure DevOps rest API

I am setting up the PR(created manualy by the users) to autocmoplete using rest api from azure pipeline getting following error, kindly help to resolve the issue. details are…
0
votes
1 answer

Undo Ability to Push to Github (Cancel local changes)

I've been struggling to undo some local changes that are not consistent with a repository I'm working on. I can't figure out how to just return the file to a completely synced state so that I can return to working on a project. Any idea what's…
0
votes
1 answer

How to configure PullApprove to send requests to a subset of a team that can submit approvals?

I'm using PullApprove v3 for GitHub PRs. I have a larger team general-team and a smaller team specific-team. specific-team is a subset of general-team. I want to allow PR approvals from anyone on general-team but only send requests to specific-team…
savagedata
  • 713
  • 1
  • 5
  • 10
0
votes
1 answer

Trigger CI when a commit is pushed and a PR is approved?

I used to have a GitHub Actions workflow configured like this: name: CI on: [push, pull_request] I was interested in switching my trigger to a PR approval instead, so I changed it to: name: CI on: [push, pull_request_review] and in the job I…
knocte
  • 16,941
  • 11
  • 79
  • 125
0
votes
1 answer

Failed to execute Git Fatal: The current branch (Ticket# - Action ) has no upstream branch

The problem: Hello, I am using vscode with bitbucket that contains my repos. I can create a new branch. I can make my changes and save the commits. When I go to generate the pull request in vscode I am promtped the error "Failed to execute Git…
0
votes
1 answer

Create Pull Request from develop to main automatically in Azure DevOps

In AzureDevOps, we have three branches: feature develop main We create a Pull Request (PR) from feature to develop. Once the PR is complete, we create a PR from develop to main. Is there a way to create a PR from develop to main automatically when…
user989988
  • 3,006
  • 7
  • 44
  • 91
0
votes
1 answer

Github Action on pull_request - process files changed in the current commit

I have a github action workflow that gets triggered on: pull_request uses: tj-actions/changed-files@v35. uses: actions/checkout@v3 It also gets triggered on every commit pushed to the PR requesting branch which is desirable but it picks up ALL the…
0
votes
1 answer

What is in a Azure DevOps PR artifact?

I have two branches, develop and feature/cool_feature. When I create a PR to merge feature/cool_feature into develop, our Azure Devops will automatically run a pipeline for this PR. My assumption is that the resulting artifacts contain both the…
Timo
  • 2,212
  • 2
  • 25
  • 46