Re: [GRASS-dev] git: how to avoid bogus merge commits

st 22. 5. 2019 v 21:44 odesílatel Even Rouault > > napsal: > >* git fetch origin (assuming 'origin' point to OSGeo/grass) > *>* git rebase origin/master > * > or possibly > git pull --rebase git pull --rebase can be indeed used to the same eff

Re: [GRASS-dev] git: how to avoid bogus merge commits

On Wed, May 22, 2019 at 3:31 PM Markus Metz wrote: > > Of course I could (should) do a "git pull" before a "git push", but I > think it is not uncommon that someone forgets the "git pull" before the > "git push". > It is not that executing push before pull causes problems. You simply need to do

Re: [GRASS-dev] git: how to avoid bogus merge commits

Hi, st 22. 5. 2019 v 21:44 odesílatel Even Rouault napsal: > git fetch origin (assuming 'origin' point to OSGeo/grass) > git rebase origin/master or possibly git pull --rebase could be used? Ma -- Martin Landa http://geo.fsv.cvut.cz/gwiki/Landa http://gismentors.cz/mentors/landa ___

Re: [GRASS-dev] git: how to avoid bogus merge commits

On Wed, May 22, 2019 at 9:44 PM Even Rouault wrote: > > On mercredi 22 mai 2019 21:30:58 CEST Markus Metz wrote: > > Hi git gurus, > > > > when I modify my local copy and do git commit + git push, I sometimes get > > an error: > > "failed to push some refs" > > and a hint: > > "Updates were reject

Re: [GRASS-dev] git: how to avoid bogus merge commits

On mercredi 22 mai 2019 21:30:58 CEST Markus Metz wrote: > Hi git gurus, > > when I modify my local copy and do git commit + git push, I sometimes get > an error: > "failed to push some refs" > and a hint: > "Updates were rejected because the remote contains work that you do not > have locally. Th

[GRASS-dev] git: how to avoid bogus merge commits

Hi git gurus, when I modify my local copy and do git commit + git push, I sometimes get an error: "failed to push some refs" and a hint: "Updates were rejected because the remote contains work that you do not have locally. This is usually caused by another repository pushing to the same ref. You m