[Phpmyadmin-devel] Git repo update

[Marc Delisle]

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.

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