Re: [git-users] Re: git pull/merge without committing local changes

2015-09-22 Thread Machiel Kolstein
Thank you very much! Cheers, Machiel On Monday, September 21, 2015 at 7:22:39 PM UTC+2, Konstantin Khomoutov wrote: > > On Fri, 18 Sep 2015 01:46:14 -0700 (PDT) > Machiel Kolstein <mkol...@ifae.es > wrote: > > [...] > > Just after reading i

[git-users] Re: git pull/merge without committing local changes

2015-09-18 Thread Machiel Kolstein
Hi Konstantin, Let me first of all say: wow! Many thanks for that more than complete explanation. Again: wow! Just after reading it for the first time, I see that there is not only one, but two very well explained answers to my question (I am not sure yet which one I will chose, because it

Re: [git-users] newbie: git push?

2019-11-14 Thread Machiel Kolstein
achiel On Thu, Nov 14, 2019 at 4:46 PM Konstantin Khomoutov wrote: > On Thu, Nov 14, 2019 at 06:30:57AM -0800, Machiel Kolstein wrote: > > > > Thank you, that worked on one machine. > > However, if I tried the same thing on a different machine (after cloning > > th

Re: [git-users] newbie: git push?

2019-11-14 Thread Machiel Kolstein
Thank you, that worked on one machine. However, if I tried the same thing on a different machine (after cloning the same repository), I get the following error after doing "git push": remote: Resolving deltas: 100% (2/2), completed with 2 local objects. remote: error: GH007: Your push would

[git-users] newbie: git push?

2019-11-14 Thread Machiel Kolstein
Hi, I am trying to learn how to use GitHub and I started with creating some test repository (https://github.com/matxil/test_20191114). It only consists of a README and a simpleCode.py file. Next, I cloned the repository to my computer ( git clone https://github.com/matxil/test_20191114.git )