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 :)