[Phpmyadmin-devel] Git repo update
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. -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.
Le 2012-05-02 09:09, Thilina Buddika Abeyrathna a écrit :
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.
Thilina, I'm not sure what you mean by "it did not work", but there is another way; the student guide [0] refers you to [1]. [0] http://wiki.phpmyadmin.net/pma/GSoC_2012_Student_Guide#Publish_a_Git_reposit... [1] http://wiki.phpmyadmin.net/pma/Git#Publishing_changes_for_merge -- Marc Delisle http://infomarc.info
On Wed, May 2, 2012 at 6:49 PM, Marc Delisle <marc@infomarc.info> wrote:
Le 2012-05-02 09:09, Thilina Buddika Abeyrathna a écrit :
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.
Thilina, I'm not sure what you mean by "it did not work", but there is another way; the student guide [0] refers you to [1].
[0]
http://wiki.phpmyadmin.net/pma/GSoC_2012_Student_Guide#Publish_a_Git_reposit...
[1] http://wiki.phpmyadmin.net/pma/Git#Publishing_changes_for_merge
Hi Marc, Thank for your reply, But I meant that when the original repo (phpmyadmin/phpmyadmin) I forked gets updated, I need to add those updates to my fork.
-- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.
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
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. -- Regards.
Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.
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. -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.
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? -- Marc Delisle http://infomarc.info
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' -- Regards.
Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.
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 -- Marc Delisle http://infomarc.info
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)
-- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.
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
On Wed, May 2, 2012 at 8:08 PM, Marc Delisle <marc@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@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
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.
Le 2012-05-02 10:47, Thilina Buddika Abeyrathna a écrit :
On Wed, May 2, 2012 at 8:08 PM, Marc Delisle <marc@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@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
when I tried 'git merge upstream/master' , error: Your local changes to the following files would be overwritten by merge: ------------- Aborting
I guess you have not committed your changes to your repository. Show us the output of git checkout origin/master git status -- Marc Delisle http://infomarc.info
On Wed, May 2, 2012 at 8:08 PM, Marc Delisle <marc@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@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
HI Marc, I think the problem may be that the remote repo 'origin' ( git:// github.com/thilinaa/phpmyadmin.git ) is read-only and must be replaced with git@github.com:thilinaa/phpmyadmin.git to enable push access. git remote rm origin git remote add origin "git@github.com:thilinaa/phpmyadmin.git" git fetch upstream git merge upstream/master git push origin Thilina, please check that you have added your SSH public key to github allowed keys list in your account.
-- 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
-- Atul Pratap Singh Senior Undergraduate Student Institute Of Technology, Banaras Hindu University, Varanasi, India.
Le 2012-05-02 10:47, Atul Pratap Singh a écrit :
On Wed, May 2, 2012 at 8:08 PM, Marc Delisle <marc@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@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
HI Marc, I think the problem may be that the remote repo 'origin' ( git:// github.com/thilinaa/phpmyadmin.git ) is read-only and must be replaced with git@github.com:thilinaa/phpmyadmin.git to enable push access.
Hi Atul, I agree with your suggestion, but now that Thilina has local changes, I'm not sure how he can keep them. Maybe by doing this prior to removing his origin repository git diff > /someotherpath/localchanges.diff
git remote rm origin git remote add origin "git@github.com:thilinaa/phpmyadmin.git" git fetch upstream git merge upstream/master git push origin
Thilina, please check that you have added your SSH public key to github allowed keys list in your account.
-- Marc Delisle http://infomarc.info
Le 2012-05-02 12:13, Marc Delisle a écrit :
HI Marc, I think the problem may be that the remote repo 'origin' ( git:// github.com/thilinaa/phpmyadmin.git ) is read-only and must be replaced with git@github.com:thilinaa/phpmyadmin.git to enable push access.
Hi Atul, I agree with your suggestion, but now that Thilina has local changes, I'm not sure how he can keep them. Maybe by doing this prior to removing his origin repository
git diff > /someotherpath/localchanges.diff
Forget my last remark; removing a repository reference does not make one lose his local changes.
git remote rm origin git remote add origin "git@github.com:thilinaa/phpmyadmin.git" git fetch upstream
Probably add here: git checkout origin/master
git merge upstream/master git push origin
Thilina, please check that you have added your SSH public key to github allowed keys list in your account.
-- Marc Delisle http://infomarc.info
On Wed, May 2, 2012 at 10:12 PM, Marc Delisle <marc@infomarc.info> wrote:
Le 2012-05-02 12:13, Marc Delisle a écrit :
HI Marc, I think the problem may be that the remote repo 'origin' ( git:// github.com/thilinaa/phpmyadmin.git ) is read-only and must be replaced with git@github.com:thilinaa/phpmyadmin.git to enable push access.
Hi Atul, I agree with your suggestion, but now that Thilina has local changes, I'm not sure how he can keep them. Maybe by doing this prior to removing his origin repository
git diff > /someotherpath/localchanges.diff
Forget my last remark; removing a repository reference does not make one lose his local changes.
Marc, I think he might not need to remove and re-clone the whole repo, maybe git rebase may help. Or git stash git merge upstream/master git stash pop
git remote rm origin git remote add origin "git@github.com:thilinaa/phpmyadmin.git" git fetch upstream
Probably add here: git checkout origin/master
git merge upstream/master git push origin
Thilina, please check that you have added your SSH public key to github allowed keys list in your account.
-- 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
-- Atul Pratap Singh Senior Undergraduate Student Institute Of Technology, Banaras Hindu University, Varanasi, India.
On Wed, May 2, 2012 at 11:15 PM, Atul Pratap Singh < atulpratapsingh05@gmail.com> wrote:
On Wed, May 2, 2012 at 10:12 PM, Marc Delisle <marc@infomarc.info> wrote:
Le 2012-05-02 12:13, Marc Delisle a écrit :
HI Marc, I think the problem may be that the remote repo 'origin' ( git:// github.com/thilinaa/phpmyadmin.git ) is read-only and must be replaced with git@github.com:thilinaa/phpmyadmin.git to enable push access.
Hi Atul, I agree with your suggestion, but now that Thilina has local changes, I'm not sure how he can keep them. Maybe by doing this prior to removing his origin repository
git diff > /someotherpath/localchanges.diff
Forget my last remark; removing a repository reference does not make one lose his local changes.
Marc, I think he might not need to remove and re-clone the whole repo, maybe git rebase may help. Or git stash git merge upstream/master git stash pop
But what if the local changes are not desired to be published to the origin right now. Marc, should we always experiment on a separate branch or repo or is there any other way to make selective push to origin like HEAD~1 or something?
git remote rm origin git remote add origin "git@github.com:thilinaa/phpmyadmin.git" git fetch upstream
Probably add here: git checkout origin/master
git merge upstream/master git push origin
Thilina, please check that you have added your SSH public key to github allowed keys list in your account.
-- 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
-- Atul Pratap Singh Senior Undergraduate Student Institute Of Technology, Banaras Hindu University, Varanasi, India.
-- Atul Pratap Singh Senior Undergraduate Student Institute Of Technology, Banaras Hindu University, Varanasi, India.
Le 2012-05-02 14:13, Atul Pratap Singh a écrit :
But what if the local changes are not desired to be published to the origin right now. Marc, should we always experiment on a separate branch or repo or is there any other way to make selective push to origin like HEAD~1 or something?
Atul, you should always push your changes to the origin (on github), this is how your mentor (me) will look at your work. You can experiment on a separate branch if you want, but this will be part of the same repository. -- Marc Delisle http://infomarc.info
Le 2012-05-02 14:25, Marc Delisle a écrit :
Le 2012-05-02 14:13, Atul Pratap Singh a écrit :
But what if the local changes are not desired to be published to the origin right now. Marc, should we always experiment on a separate branch or repo or is there any other way to make selective push to origin like HEAD~1 or something?
Atul, you should always push your changes to the origin (on github), this is how your mentor (me) will look at your work. You can experiment on a separate branch if you want, but this will be part of the same repository.
About experimenting, of course you should test a chunk of code that relates to one feature or one refactoring, before committing it to some branch (master or testing branch). -- Marc Delisle http://infomarc.info
On Thu, May 3, 2012 at 12:03 AM, Marc Delisle <marc@infomarc.info> wrote:
Le 2012-05-02 14:25, Marc Delisle a écrit :
Le 2012-05-02 14:13, Atul Pratap Singh a écrit :
But what if the local changes are not desired to be published to the origin right now. Marc, should we always experiment on a separate branch or repo or is there any other way to make selective push to origin like HEAD~1 or something?
Atul, you should always push your changes to the origin (on github), this is how your mentor (me) will look at your work. You can experiment on a separate branch if you want, but this will be part of the same repository.
About experimenting, of course you should test a chunk of code that relates to one feature or one refactoring, before committing it to some branch (master or testing branch).
Thanks Marc, I would always push properly tested commits to github origin. And I would use separate branch or repo clones for experimenting. Thilina, About pushing as in your case, if you don't wanna push your current local changes to github origin, you can use:- git checkout master git push origin master~x:master (x being integer = number of commits to leave from HEAD) After you have properly merged upstream to 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
-- Atul Pratap Singh Senior Undergraduate Student Institute Of Technology, Banaras Hindu University, Varanasi, India.
Le 2012-05-02 14:54, Atul Pratap Singh a écrit :
On Thu, May 3, 2012 at 12:03 AM, Marc Delisle <marc@infomarc.info> wrote:
Le 2012-05-02 14:25, Marc Delisle a écrit :
Le 2012-05-02 14:13, Atul Pratap Singh a écrit :
But what if the local changes are not desired to be published to the origin right now. Marc, should we always experiment on a separate branch or repo or is there any other way to make selective push to origin like HEAD~1 or something?
Atul, you should always push your changes to the origin (on github), this is how your mentor (me) will look at your work. You can experiment on a separate branch if you want, but this will be part of the same repository.
About experimenting, of course you should test a chunk of code that relates to one feature or one refactoring, before committing it to some branch (master or testing branch).
Thanks Marc, I would always push properly tested commits to github origin. And I would use separate branch or repo clones for experimenting. Thilina, About pushing as in your case, if you don't wanna push your current local changes to github origin, you can use:- git checkout master git push origin master~x:master (x being integer = number of commits to leave from HEAD) After you have properly merged upstream to master.
Atul, a local change is not a commit. I suspect Thilina has not committed his changes. -- Marc Delisle http://infomarc.info
On Thu, May 3, 2012 at 12:27 AM, Marc Delisle <marc@infomarc.info> wrote:
Le 2012-05-02 14:54, Atul Pratap Singh a écrit :
On Thu, May 3, 2012 at 12:03 AM, Marc Delisle <marc@infomarc.info> wrote:
Le 2012-05-02 14:25, Marc Delisle a écrit :
Le 2012-05-02 14:13, Atul Pratap Singh a écrit :
But what if the local changes are not desired to be published to the origin right now. Marc, should we always experiment on a separate branch or repo or is there any other way to make selective push to origin like HEAD~1 or something?
Atul, you should always push your changes to the origin (on github), this is how your mentor (me) will look at your work. You can experiment on a separate branch if you want, but this will be part of the same repository.
About experimenting, of course you should test a chunk of code that relates to one feature or one refactoring, before committing it to some branch (master or testing branch).
Thanks Marc, I would always push properly tested commits to github origin. And I would use separate branch or repo clones for experimenting. Thilina, About pushing as in your case, if you don't wanna push your current local changes to github origin, you can use:- git checkout master git push origin master~x:master (x being integer = number of commits to leave from HEAD) After you have properly merged upstream to master.
Atul, a local change is not a commit. I suspect Thilina has not committed his changes.
Marc, yeah maybe he has not committed, so pushing won't get affected. I think now, Thilina needs to restate his status on the problem :).
-- 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
-- Atul Pratap Singh Senior Undergraduate Student Institute Of Technology, Banaras Hindu University, Varanasi, India.
On Thu, May 3, 2012 at 1:02 AM, Atul Pratap Singh < atulpratapsingh05@gmail.com> wrote:
On Thu, May 3, 2012 at 12:27 AM, Marc Delisle <marc@infomarc.info> wrote:
Le 2012-05-02 14:54, Atul Pratap Singh a écrit :
On Thu, May 3, 2012 at 12:03 AM, Marc Delisle <marc@infomarc.info> wrote:
Le 2012-05-02 14:25, Marc Delisle a écrit :
Le 2012-05-02 14:13, Atul Pratap Singh a écrit :
But what if the local changes are not desired to be published to the origin right now. Marc, should we always experiment on a separate branch or repo or is there any other way to make selective push to origin like HEAD~1 or something?
Atul, you should always push your changes to the origin (on github), this is how your mentor (me) will look at your work. You can experiment on a separate branch if you want, but this will be part of the same repository.
About experimenting, of course you should test a chunk of code that relates to one feature or one refactoring, before committing it to some branch (master or testing branch).
Thanks Marc, I would always push properly tested commits to github origin. And I would use separate branch or repo clones for experimenting. Thilina, About pushing as in your case, if you don't wanna push your current local changes to github origin, you can use:- git checkout master git push origin master~x:master (x being integer = number of commits to leave from HEAD) After you have properly merged upstream to master.
Atul, a local change is not a commit. I suspect Thilina has not committed his changes.
Marc, yeah maybe he has not committed, so pushing won't get affected. I think now, Thilina needs to restate his status on the problem :).
Hi , Thank you all for helping me to recover the problem. Now it has resolved. Now I have to do is commit my local changes. But still I'm not ready for that because I have not complete yet. I will commit my refactoring code. -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.
Le 2012-05-02 10:47, Atul Pratap Singh a écrit :
Thilina, please check that you have added your SSH public key to github allowed keys list in your account.
See http://help.github.com/win-set-up-git/ -- Marc Delisle http://infomarc.info
Le 2012-05-02 09:30, Alex Marin a écrit :
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
Alex, I think that this will work only if the local git repo was created empty. If he used "git clone", "origin" points to the first repo.
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
------------------------------------------------------------------------------ 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
-- Marc Delisle http://infomarc.info
participants (4)
-
Alex Marin -
Atul Pratap Singh -
Marc Delisle -
Thilina Buddika Abeyrathna