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

[Markus Metz]

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 may want to first integrate the remote changes (e.g., 'git
pull ...') before pushing again."

OK, I do "git pull" and get confronted with a merge commit message.

After that, I do "git push" and commit a merge that does nothing.

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". Therefore I would like to know how I can get rid of this bogus merge
commit that changes nothing but spams the history, and burns Travis CI,
e.g.  [1, 2].

Thanks,

Markus M

[1] https://travis-ci.com/OSGeo/grass/builds/112790153
[2] https://travis-ci.com/OSGeo/grass/builds/112567602
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/grass-dev/attachments/20190522/739e380f/attachment.html>