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 … Read more
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 … Read more
Just a simple addition to help someone else looking for this solution. You can pass in the number of previous commits you would like to squash. for example, git rebase -i HEAD~3 This will bring up the last 3 commits in the editor.
You need to basically create a new branch & cherry-pick the commits you want to add to it. Note: you might need these before the checkout/cherry-pick commands git remote add upstream <git repository> git remote update git checkout -b <new-branch-name> upstream/master git cherry-pick <SHA hash of commit> git push origin <new-branch-name> Afterwards, you will see … Read more
Update: Via Webpage You can also do this via the github webpage. I assume, you should have already a fork (MyFork) of the common repo (BaseRepo) which has the pending pull request from a fork (OtherFork) you are interested in. Navigate to the fork (OtherFork) which has initiated the pull request which you like to … Read more
The easiest way to do that is like this: git fetch origin pull/2/head git checkout -b pullrequest FETCH_HEAD You will now be on a new branch that is on the state of the pull request. You might want to set up an alias by running git config –global alias.pr ‘!f() { git fetch -fu ${2:-origin} … Read more
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 for … Read more
git pull origin pull/28/head Or git fetch origin pull/28/head:28 git checkout 28 Can I pull a not-yet-merged pull request?
Both Git (the software) and GitHub (the web service) have a concept called “pull request”, and unfortunately they are not exactly the same thing. Native Git The native Git request-pull command has a very short manual page with the following one-sentence description: Summarizes the changes between two commits to the standard output, and includes the … Read more
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.