pull-request

Github pull request without old commits

放肆的年华 提交于 2019-11-28 23:33:06
I have forked project at github. I make one commit and pull request it. This commit was approved. Then i make second commit and pull request it too. But in pull request there were 2 commits: my second commit and old commit which was approved. How can i sync my repository and main repository? Adam Vandenberg Merge back from the upstream repository, or create the new pull request on a new branch. Or rebase on top of upstream: git remote add upstream (url-for-upstream-repository) git fetch upstream git rebase upstream/master git push -f origin (do new pull request on website) 来源: https:/

How to resolve merge conflict in pull request in VSTS?

非 Y 不嫁゛ 提交于 2019-11-28 19:09:34
I've created pull request I got into this: "Approve" button does nothing and complete is disabled. How do I resolve this confligt in pull request? Update Microsoft just added browser based merges. This may get you out of a pickle for small conflicts. And offers improved visualizations of the different scenarios as of Sprint 150 . For more complex situations: You have two options to resolve the conflict, reverse-integrate the changes from the target branch (which creates additional merge commits), or rebase on the target branch (which leaves your history nice and clean). Merge from target to

Delete a closed pull request from GitHub [closed]

﹥>﹥吖頭↗ 提交于 2019-11-28 19:02:30
I accidentally made a wrong pull request and ended up closing the request myself. It's in a closed state right now but it's accessible via direct URL and showing on my activity bar. Is there any way to delete a pull request completely so it's no longer accessible via URL or shows up on your activity history? There is no way you can delete a pull request yourself -- you and the repo owner (and all users with push access to it) can close it, but it will remain in the log. This is part of the philosophy of not denying/hiding what happened during development. However, if there are critical reasons

Merge pull request to a different branch than default, in Github

六月ゝ 毕业季﹏ 提交于 2019-11-28 16:55:29
A pull request comes into my repo hosted on Github. By default it is merged into the master branch. Is there any way for me to change which branch the changes would be merged into? maliayas As of 15.08.2016 GitHub allows changing the target branch of a pull request via the GUI. Click Edit next to the title, then select the branch from the dropdown. You can now change the base branch of an open pull request. After you’ve created a pull request, you can modify the base branch so that the changes in the pull request are compared against a different branch. By changing the base branch of your

How to cancel a pull request on github?

家住魔仙堡 提交于 2019-11-28 16:54:48
问题 How can a pull request on github be cancelled? UPDATE The accepted answer didn't detail the steps in the answer and in any case, github has made this dead simple since this question was asked, so here are the steps: Visit the pull request page Tap the "close pull request button" 回答1: GitHub now supports closing a pull request 回答2: In the spirit of a DVCS (as in "Distributed"), you don't cancel something you have published: Pull requests are essentially patches you have send (normally by email

Bitbucket: Send a pull request via command line?

◇◆丶佛笑我妖孽 提交于 2019-11-28 16:49:41
I have to send a lot of pull requests, so I would rather use the bash command line than bitbucket's web interface. Usage example: $ git-req username Here is such a script for Github: http://pastebin.com/F9n3nPuu Is there one for Bitbucket? s3m3n Bitbucket with it's RESTful API 2.0 supports managing pull requests without interface. In CLI you can request it with CURL. This older version of the documentation has better interface details. Get pull request data with CURL To get full data about specific pull request: $ curl --user s3m3n:bbpassword https://bitbucket.org/api/2.0/repositories/s3m3n

Working while waiting for pending PR

二次信任 提交于 2019-11-28 16:49:05
I'm working on a project and I submitted my first pull request and while I'm waiting I want to continue on working on my project building up from what I worked on the merge that's still pending on. Right now I have : *master user_story_1 user_story_1 has an open pull request. Now I'm trying to create a new branch user_story_2 where I can continue the work I left of at user_story_1 . How can I do this in Git without getting into any conflict or affecting my pending merge? I'm assuming you want to start the new user_story_2 branch on top of the work you've done in user_story_1 . Here's the

On GitHub, what's the difference between reviewer and assignee?

半世苍凉 提交于 2019-11-28 16:46:07
A feature added on Dec, 7, 2016, announced on GitHub blog, introduced the option to add reviewers to a Pull Request You can now request a review explicitly from collaborators, making it easier to specify who you'd like to review your pull request. You can also see a list of people who you are awaiting review from in the pull request page sidebar, as well as the status of reviews from those who have already left them. However, explicit setting a reviewer for a PR was already done by assigning people ( assignees option). With both options now available, what's the role of each option since they

How to do a pull request in GitHub with only the latest commit in the master branch of my forked repository

谁说我不能喝 提交于 2019-11-28 16:22:45
I forked a repository on github. I made some changes and did a pull request. Now I made some other changes and want to do a new pull request, but on the preview screen before doing the pull request it shows the old commits too (the ones that were already accepted). How do I select only the latest commit in the master branch of my forked repository so that I can do a pull request with only that commit? This answer from a coworker fixed my problem: git checkout -b NEW_BRANCH_NAME LAST_COMMIT_NAME_BEFORE_THE_ONE_WANTED git cherry-pick COMMIT_NAME_WANTED git push origin NEW_BRANCH_NAME Then on

Working while waiting for pending PR

流过昼夜 提交于 2019-11-28 16:13:40
问题 I'm working on a project and I submitted my first pull request and while I'm waiting I want to continue on working on my project building up from what I worked on the merge that's still pending on. Right now I have : *master user_story_1 user_story_1 has an open pull request. Now I'm trying to create a new branch user_story_2 where I can continue the work I left of at user_story_1 . How can I do this in Git without getting into any conflict or affecting my pending merge? 回答1: I'm assuming you