• David (4/4) Apr 19 2012 I am having a problem with my Pull-Request, I don't know how I can do
• Brad Anderson (12/16) Apr 19 2012 Pull from upstream (if you don't have upstream set up as a remote
• Dmitry Olshansky (14/18) Apr 19 2012 Should be as simple as:
• David (2/20) Apr 19 2012 Thanks you two, it seems like it worked ... at least I hope that :)

David <d dav1d.de> writes:

I am having a problem with my Pull-Request, I don't know how I can do 
that: 
https://github.com/D-Programming-Language/phobos/pull/482#issuecomment-5070817
I hope you can give me a short intstruction what to do, thanks.

"Brad Anderson" <eco gnuk.net> writes:

On Thursday, 19 April 2012 at 17:27:18 UTC, David wrote:
 I am having a problem with my Pull-Request, I don't know how I 
 can do that: 
 https://github.com/D-Programming-Language/phobos/pull/482#issuecomment-5070817
 I hope you can give me a short intstruction what to do, thanks.

Pull from upstream (if you don't have upstream set up as a remote 
do a "git remote add upstream 
https://github.com/D-Programming-Language/phobos.git" then "git 
pull upstream master").  Then do "git checkout conv2" if you 
aren't already on that branch.  Finally "git rebase master".  
Resolve conflicts, if necessary.  Then git push -f origin 
(presumably origin is your GitHub repo). The -f is required to 
force the push because you are screwing around with history when 
you do a rebase.

Regards,
Brad Anderson

Dmitry Olshansky <dmitry.olsh gmail.com> writes:

On 19.04.2012 21:27, David wrote:
 I am having a problem with my Pull-Request, I don't know how I can do
 that:
 https://github.com/D-Programming-Language/phobos/pull/482#issuecomment-5070817

 I hope you can give me a short intstruction what to do, thanks.

Should be as simple as:

git pull --rebase https://github.com/D-Programming-Language/phobos.git 
master
And fix conflicts if any.
(assuming you are on the same branch as pull request)
then a forced push:
git push -f


But you'd better setup some alias for DPL as e.g. 'upstream' remote Brad 
already mentioned.
then it looks like this:

git pull --rebase upstream master

-- 
Dmitry Olshansky

David <d dav1d.de> writes:

Am 19.04.2012 20:00, schrieb Dmitry Olshansky:
 On 19.04.2012 21:27, David wrote:
 I am having a problem with my Pull-Request, I don't know how I can do
 that:
 https://github.com/D-Programming-Language/phobos/pull/482#issuecomment-5070817


 I hope you can give me a short intstruction what to do, thanks.

 Should be as simple as:

 git pull --rebase https://github.com/D-Programming-Language/phobos.git
 master
 And fix conflicts if any.
 (assuming you are on the same branch as pull request)
 then a forced push:
 git push -f


 But you'd better setup some alias for DPL as e.g. 'upstream' remote Brad
 already mentioned.
 then it looks like this:

 git pull --rebase upstream master

Thanks you two, it seems like it worked ... at least I hope that :)