[GNC-dev] gnucash master: Multiple changes pushed

[Geert Janssens]

Op maandag 7 oktober 2019 04:51:57 CEST schreef John Ralls:
> > On Oct 6, 2019, at 1:02 PM, Geert Janssens <geert.gnucash at kobaltwit.be>
> > wrote:
> > 
> > This push didn't make it to github due to a network glitch at
> > code.gnucash.org (unable to resolve github.com).
> > 
> > Whoever does the next push to master, please take care these commits are
> > in
> > your local master branch before doing so. Otherwise you might be tempted
> > to
> > force push to fix the inconsistency :)
> > 
> > Regards,
> > 
> > Geert
> > 
> > Op zondag 6 oktober 2019 21:57:00 CEST schreef Geert Janssens:
> >> Updated	 via  https://github.com/Gnucash/gnucash/commit/75073a7a 
(commit)
<snip>

> One shouldn't resolve push failures by force pushing. Instead do `git pull
> --rebase upstream master`, adjusting the branch and remote as necessary,
> the latter being whatever you use for git at code.gnucash.org:gnucash.
> 
I know, but it's good you write it explicitly.

In the past I have had someone drop my changes at least once due to a force 
push. That's why I chose to inform the list this time around.

Regards,

Geert