[Phpmyadmin-devel] Git repo update

[Atul Pratap Singh]

On Wed, May 2, 2012 at 10:12 PM, Marc Delisle <marc at 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 at 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 at 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 at 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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20120502/8b67195d/attachment.html>