Comments on: Merging in a GitHub fork http://ken-blog.krugler.org/2009/04/14/merging-in-a-github-fork/ Mon, 19 Dec 2011 02:06:37 +0000 hourly 1 http://wordpress.com/ By: Dave Coleman http://ken-blog.krugler.org/2009/04/14/merging-in-a-github-fork/#comment-709 Mon, 07 Nov 2011 18:03:50 +0000 http://ken-blog.krugler.org/?p=126#comment-709 Thanks, worked great!

]]> By: kkrugler http://ken-blog.krugler.org/2009/04/14/merging-in-a-github-fork/#comment-684 Wed, 27 Jul 2011 03:19:08 +0000 http://ken-blog.krugler.org/?p=126#comment-684 Hi Sorcix,

You’re right, and Willem also updated notes on his page about this shortcut. He includes info how to switch to the remote branch for testing, which is handy. Specifically:

% git remote add chris git://github.com/cwensel/bixo.git
% git fetch chris
% git checkout chris/master

Now test Chris’s modifications

% git checkout master
% git merge chris/master

]]> By: Sorcix http://ken-blog.krugler.org/2009/04/14/merging-in-a-github-fork/#comment-676 Thu, 21 Jul 2011 14:03:35 +0000 http://ken-blog.krugler.org/?p=126#comment-676 You didn’t have to branch it first. You could simply do

% cd git/github/bixo
% git remote add chris git://github.com/cwensel/bixo.git
% git merge chris/master

]]> By: Ryan http://ken-blog.krugler.org/2009/04/14/merging-in-a-github-fork/#comment-254 Tue, 05 May 2009 05:16:52 +0000 http://ken-blog.krugler.org/?p=126#comment-254 Thanks Ken — needed to figure out how to merge my fork, worked like a charm :)

]]>