Le 2012-05-02 10:32, Thilina Buddika Abeyrathna a écrit :

> On Wed, May 2, 2012 at 7:59 PM, Marc Delisle <marc@infomarc.info> wrote:
>
>> Le 2012-05-02 10:21, Thilina Buddika Abeyrathna a écrit :
>>> On Wed, May 2, 2012 at 7:38 PM, Marc Delisle <marc@infomarc.info> wrote:
>>>
>>>> Le 2012-05-02 10:04, Thilina Buddika Abeyrathna a écrit :
>>>>> On Wed, May 2, 2012 at 7:07 PM, Thilina Buddika Abeyrathna <
>>>>> thilinaabeyrathna@gmail.com> wrote:
>>>>>
>>>>>>
>>>>>>
>>>>>> On Wed, May 2, 2012 at 7:00 PM, Alex Marin <alex.ukf@gmail.com>
>> wrote:
>>>>>>
>>>>>>> On Wed, May 2, 2012 at 4:09 PM, Thilina Buddika Abeyrathna
>>>>>>> <thilinaabeyrathna@gmail.com> wrote:
>>>>>>>> Hi Marc,
>>>>>>>> I used following command to update my git repo in GitHub.
>>>>>>>>
>>>>>>>> git remote add upstream git://github.com/thilinaa/phpmyadmin.git
>>>>>>>>
>>>>>>>>
>>>>>>>> git fetch upstream
>>>>>>>>
>>>>>>>> But it did not work for my repo. Please give me some suggestions.
>>>>>>>
>>>>>>> Hi Thilina,
>>>>>>>
>>>>>>> Your command adds your fork of phpmyadmin as a remote repo. I
>>>>>>> assume you want to get the latest changes from the phpmyadmin
>>>>>>> official repo. So you first have to add the remote phpmyadmin repo:
>>>>>>>   git remote add upstream git://github.com/phpmyadmin/phpmyadmin.git
>>>>>>> For getting the latest updates from there, you should use:
>>>>>>>  git pull upstream [branch] (or git fetch as you mentioned).
>>>>>>>
>>>>>>> And finally, if you want to push the changes to your fork, then you
>>>> first
>>>>>>> have to create your fork and add it as a remote repo:
>>>>>>>   git remote add origin git://github.com/thilinaa/phpmyadmin.git
>>>>>>> Then, you push with
>>>>>>>   git push origin [branch]
>>>>>>>
>>>>>>> You can also find more details at [0] and [1].
>>>>>>>
>>>>>>> [0] http://help.github.com/fork-a-repo/
>>>>>>> [1] http://help.github.com/remotes/
>>>>>>>
>>>>>>> All the best,
>>>>>>> Alex
>>>>>>>
>>>>>>> Hi Alex,
>>>>>> Thank you very much.
>>>>>
>>>>>
>>>>> Alex,
>>>>> I did what you asked to do. But still my fork not up to date.
>>>>
>>>> Thilina,
>>>> how did you create your local repository in the first place?
>>>>
>>>> using 'git clone'
>>
>> Please show us the output of
>>
>> git remote -v show
>>
>> origin    git://github.com/thilinaa/phpmyadmin.git (fetch)
> origin    git://github.com/thilinaa/phpmyadmin.git (push)
> upstream    git://github.com/phpmyadmin/phpmyadmin.git (fetch)
> upstream    git://github.com/phpmyadmin/phpmyadmin.git (push)

Ok, try this:

git remote rm upstream
git remote add upstream https://github.com/phpmyadmin/phpmyadmin.git
git remote update upstream

Then, to sync from upstream:

git checkout origin/master
git merge upstream/master

--
Marc Delisle
http://infomarc.info

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Phpmyadmin-devel mailing list
Phpmyadmin-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel