[GRASS-dev] git merge mess on master

GRASS GRASS developer
1 
On Tue, May 21, 2019 at 11:23 AM Bas Couwenberg <[sebastic at xs4all.nl](https://lists.osgeo.org/mailman/listinfo/grass-dev)> wrote:
><i> On 2019-05-21 11:22, Markus Neteler wrote:
</i>><i> > How to revert that? Of course someone had to run into this at some
</i>><i> > point, so seems I "volunteered" to be the first :((
</i>> > *rebase and force push.*

Vaclav Petras <wenzeslaus at gmail.com> wrote:

  1. There is probably a smart way to resolve it. Something along the lines
    of what Bas suggested to the situation before but you can also backup diffs
    for all you changes (if any), delete fork and delete your local clone and start over.

@all

Please, keep in mind that git push --force is probably the only command that you should never use on main repo.

You are free to force push whatever you want on personal/private repos/branches. Nevertheless, all commits in the shared repository should be considered immutable. Please don’t break this assumption. If there is need to revert something, use git revert instead.

all the best,
Panos