pull-request

Is it possible to create merge requests in pure Git from the command line?

微笑、不失礼 提交于 2019-11-27 11:30:53
问题 I'm using a behind-firewall install of Gitorious. I can go into the web application and create a pull request from a clone and target the master repo from which it was cloned. I'd like to be able to do this on the command line. More specifically, I'd like to be able to open merge requests from the command line from one branch to another (rather than from clone to seed repo). Since I'm not using Github, I can't use Github specific tools or libraries. Is this possible? 回答1: There is no such

How to resolve merge conflict in pull request in VSTS?

天涯浪子 提交于 2019-11-27 11:06:09
问题 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? 回答1: 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

GitHub clone from pull request?

半腔热情 提交于 2019-11-27 10:04:41
I would like to clone a repository from GitHub. The problem is I don't want the main branch; I want the version in this unapproved pull request . Is it possible for me to clone the pull request version instead of the main repository? inancsevinc You can clone the branch you want by using the -b option in the git clone command. In your case, the branch you want to clone is the source branch of the pull request (feature/mongoose-support): git clone https://github.com/berstend/frappe.git -b feature/mongoose-support /my_clone The easiest way to do that is like this: git fetch origin pull/2/head

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

只愿长相守 提交于 2019-11-27 10:03:41
问题 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? 回答1: 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

Squash to only one “proper” commit for github pull request

本小妞迷上赌 提交于 2019-11-27 09:58:18
问题 I have a repo on github which someone else (Bob, for the sake of argument) has issued a pull request for. His code's not perfect, so we go through a few rounds of markups. As I understand it, he commits and pushes to his pull-request for each set of marked up changes. So my repository now looks like this: master: ---o A (Chowlett | | pull-req: o---o---o---o B C D (all Bob) Commit SHAs and msgs are as follows: A: 123456 Good commit <chowlett> B: 777ccc Fix the widget bug <bob> C: 888ddd Review

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

淺唱寂寞╮ 提交于 2019-11-27 09:48:01
问题 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

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

帅比萌擦擦* 提交于 2019-11-27 09:41:19
问题 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? 回答1: This answer from a coworker fixed my problem: git checkout -b NEW_BRANCH_NAME LAST

Squash all my commits into one for GitHub pull request [duplicate]

跟風遠走 提交于 2019-11-27 06:39:55
This question already has an answer here: Squash my last X commits together using Git 31 answers I made a pull request on GitHub. Now the owner of the repository is saying to squash all the commits into one. When I type git rebase -i Notepad opens with the following content: noop # Rebase 0b13622..0b13622 onto 0b13622 # # Commands: # p, pick = use commit # r, reword = use commit, but edit the commit message # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but discard this commit's log message # x, exec = run

Can you issue pull requests from the command line on GitHub?

别说谁变了你拦得住时间么 提交于 2019-11-27 05:53:08
It seems like you have to interact with github.com to initiate a pull request. Is this so? UPDATE : The hub command is now an official github project and also supports creating pull requests ORIGINAL : Seems like a particularly useful thing to add to the hub command: http://github.com/defunkt/hub or the github gem: http://github.com/defunkt/github-gem I suggest filing an issue with those projects asking for it. The github guys are pretty responsive. Zensaburou Git now ships with a subcommand 'git request-pull' [-p] <start> <url> [<end>] You can see the docs here You may find this useful but it

Send a pull request on GitHub for only latest commit

自古美人都是妖i 提交于 2019-11-27 05:44:32
I forked a project on github and am successfully making changes to my local master and pushing to origin on github. I want to send a pull request, but only want to include the last commit. The pull request UI on github.com shows the last 9 commits and I don't know how to filter that down. I was trying to understand if I should create a new local branch, check that out and somehow reset or rebase to upstream? Then apply my last commit from my master by id to the new local branch and use that for the pull request? I'm trying to get the concepts right and figure out the right command lines to do