pull-request

How to remove commits from a pull request

五迷三道 提交于 2020-01-30 13:47:10
问题 I did a pull request but after that I made some commits to the project locally which ended polluting my pull request, I tried to remove it but without any luck. I found some similar questions on StackOverflow but I can't apply what's in there. It's my first pull request on GitHub so it's kinda strange to me how all of this works. The highlighted commit is the one I need to keep and remove all the other stuff. It becomes the fourth commit in the history because I make some merge stuff. my git

BitBucket does not update refspec for PR, causing Jenkins to build old commits

穿精又带淫゛_ 提交于 2020-01-25 05:28:24
问题 I am using a local BitBucket server with Git. I am trying to get started with Continous Integration so I've set up a local Jenkins instance. The goal is to have Jenkins check out pull-requests and build the project, and then report back to BitBucket with the result. In BitBucket I am using Webhook to Jenkins for Stash which notifies my Jenkins instance each time a pull-request is created/updated. In Jenkins i am using Stash pullrequest builder plugin to have Jenkins checkout the pullrequest,

Delete file from Pull Request on GitHub

喜你入骨 提交于 2020-01-22 10:27:14
问题 I have make pull request on git (with "xcodeproj/project.pbxproj" file - my fault), so can I delete this file from created Pull Request? Thanks.. 回答1: Make a commit that deletes this file and push it. Go to your fork's Github page and click Pull Request again. You will get a message stating that you already have a pull request, and that you can adjust the commit range for it. Include your new commit (with the deletion). The offending file will still be in the changesets to be merged, mind you

Delete file from Pull Request on GitHub

社会主义新天地 提交于 2020-01-22 10:27:11
问题 I have make pull request on git (with "xcodeproj/project.pbxproj" file - my fault), so can I delete this file from created Pull Request? Thanks.. 回答1: Make a commit that deletes this file and push it. Go to your fork's Github page and click Pull Request again. You will get a message stating that you already have a pull request, and that you can adjust the commit range for it. Include your new commit (with the deletion). The offending file will still be in the changesets to be merged, mind you

Delete file from Pull Request on GitHub

坚强是说给别人听的谎言 提交于 2020-01-22 10:26:07
问题 I have make pull request on git (with "xcodeproj/project.pbxproj" file - my fault), so can I delete this file from created Pull Request? Thanks.. 回答1: Make a commit that deletes this file and push it. Go to your fork's Github page and click Pull Request again. You will get a message stating that you already have a pull request, and that you can adjust the commit range for it. Include your new commit (with the deletion). The offending file will still be in the changesets to be merged, mind you

Delete file from Pull Request on GitHub

会有一股神秘感。 提交于 2020-01-22 10:26:06
问题 I have make pull request on git (with "xcodeproj/project.pbxproj" file - my fault), so can I delete this file from created Pull Request? Thanks.. 回答1: Make a commit that deletes this file and push it. Go to your fork's Github page and click Pull Request again. You will get a message stating that you already have a pull request, and that you can adjust the commit range for it. Include your new commit (with the deletion). The offending file will still be in the changesets to be merged, mind you

On Github, merging PR into different branch

北慕城南 提交于 2020-01-14 01:57:51
问题 Say someone submits a PR to public/master on Github. Is there a way to merge that PR into a different branch? Otherwise, looks like I have to merge into public/master, then merge that backwards into a development/staging branch. It's like having people do a hotfix and then merging the hotfix into a development branch, which is something we normally should want to avoid right? Seems to make more sense to have people track and submit PRs to a staging/development branch instead of master. What

Merging pull requests together

旧巷老猫 提交于 2020-01-12 06:45:10
问题 Someone has submitted a set of pull requests to my repository on github. Unfortunately they've done this in several pull requests (one for each file) rather than submitting all the pull request for all the files in one go. After requesting him to merge them as one - and not getting any response I'm now trying to merge these pull requests together myself in the Git Bash - but having little luck - I'm quite happy using the merge buttons and making commits through the GitHub program on windows

Github downstream pull request?

倖福魔咒の 提交于 2020-01-11 04:54:07
问题 I have a project up on github, which an organization on github has forked. Can i push my code downstream to the organization's fork? I tried doing it, but was not able to. I would like to know if i can send a pull request downstream? 回答1: GitHub does allow this, and it's actually pretty easy to do, although I didn't find it very clearly-documented. The short of it, is that when you navigate on Pull Requests > New Pull Request from the GitHub UI, you get taken to the "Compare" page. In the

TFS Git Pull Request - Merge failed (Why?)

↘锁芯ラ 提交于 2020-01-07 02:52:12
问题 We are using TFS Git to create and merge pull requests. This is working fine for existing users, but when we add new users in AD (copying the exact same rights as existing users), the pull requests from the new users get an error (merge failed). Access to TFS is presumably granted by adding the user to the project team - no users seem to have any additional access rights that we can find. We have tried with multiple new users with different names (everything else is the same as existing users