http://ayende.comAyende @ RahienCopyright (C) Ayende Rahien 2004 - 2021 (c) 202660Ayende, I think I haven't read the help topic on Pull Requests (Merging Pull Requests section): http://help.github.com/pull-requests/ This is what you can do: $ git remote add kneath git://github.com/kneath/jobs.git $ git fetch kneath $ git merge kneath/error-page $ git push origin master http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment16http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment16Sun, 15 May 2011 23:41:49 GMTI help manage pull requests for a large opensource project on Github and in short experience the "merge button" is nice for typos, documentation updates, and style compliance changes. http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment13http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment13Sat, 07 May 2011 06:02:14 GMTOoh, I hadn't seen that - rejoice as my nerd rage subsides http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment12http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment12Fri, 06 May 2011 15:15:50 GMTThe old instructions for doing a local merge are still available from that same page. Just click the little `i` on the left hand side. I agree that the majority of the time it would be foolish to blindly click the merge button. However, just knowing that changes will merge cleanly is very helpful to me. It also works really well for those 'I found a spelling mistake in your documentation or readme' patches. http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment11http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment11Fri, 06 May 2011 14:54:53 GMTGit vs Hg blah blah blah, come on people - do something more constructive with your time. This is actually an annoyance, I also just want to copy the git instructions for merging in people's changes, and having the helpful messages removed is a step in a bad direction #nerdrage http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment10http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment10Fri, 06 May 2011 14:30:53 GMTAgreed. I wouldn't care if they also hadn't taken away the auto-generated version. It now takes a lot of clicks to even get to the other person's repo they're wanting me to pull from. http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment9http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment9Fri, 06 May 2011 14:29:54 GMT@Christian git's just like hg - nothing sticks out as being particularly different AFAICT. I use hg because it works better on Windows which is where I do most work these days. http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment8http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment8Fri, 06 May 2011 13:27:36 GMTI wonder what all the git fuzz is about. Since I've changed from CVS and SVN to Mercurial, I've never looked back. http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment7http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment7Fri, 06 May 2011 12:16:27 GMTA tonne of people were asking for this and were incredibly excited when it was announced. So are they all morons too? http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment6http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment6Fri, 06 May 2011 11:10:10 GMTDitch git and join the mercurial revolution :P http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment5http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment5Fri, 06 May 2011 10:12:03 GMTThe merge button is pretty nice for merging stuff which doesn't really break, such as documentation fixes or typos. It's definitely a bad idea for code changes, and a shame they removed the command-line help if the pull request can be automatically merged. http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment4http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment4Fri, 06 May 2011 10:10:22 GMTI can sugest in the admin of your repository that you define a new branch as the default branch. I think (untested, not at home) that you will merge the pull with that new branch. This is a workaround not a solution. Just an ideia. http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment3http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment3Fri, 06 May 2011 08:47:37 GMTTobi, Actually, it is likely that they do. But they are working within a trusted team, most probably, not within an open source community where you need to verify those changes. http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment2http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment2Fri, 06 May 2011 08:32:16 GMTLooks like somebody not using their own product. http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment1http://ayende.com/4833/what-where-they-thinking-the-github-merge-button-is-stupid#comment1Fri, 06 May 2011 08:26:02 GMT