[Phpmyadmin-devel] Git repo update

[Thilina Buddika Abeyrathna]

On Wed, May 2, 2012 at 8:08 PM, Marc Delisle <marc at infomarc.info> wrote:

> Le 2012-05-02 10:32, Thilina Buddika Abeyrathna a écrit :
> > On Wed, May 2, 2012 at 7:59 PM, Marc Delisle <marc at 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 at 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 at gmail.com> wrote:
> >>>>>
> >>>>>>
> >>>>>>
> >>>>>> On Wed, May 2, 2012 at 7:00 PM, Alex Marin <alex.ukf at gmail.com>
> >> wrote:
> >>>>>>
> >>>>>>> On Wed, May 2, 2012 at 4:09 PM, Thilina Buddika Abeyrathna
> >>>>>>> <thilinaabeyrathna at 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
>
>
> when I tried 'git merge upstream/master' ,
error: Your local changes to the following files would be overwritten by
merge:
------------- Aborting

-- 
Regards.

Thilina Buddika Abeyrathna,
Department of Computer Engineering,
Faculty Of Engineering,
University of Peradeniya,
Sri Lanka.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20120502/0c4e70a5/attachment.html>