[Scummvm-devel] force-push

[Willem Jan Palenstijn]

Hi all,

I just did a force-push on master to get rid of a large number of seemingly
accidentally pushed commits followed by a large revert.

The bad range was 0ceeee8148..5407bb8fcd.

LordHoto had already done a number of commits after that, up to 194c0491394,
which I rebased.

Unfortunately this total range covered quite a bit of time (8 hours), so there
may be some people who have the now-removed commits checked out. Please take
care when pulling not to accidentally merge the removed commits back into
master.

If that happens, and you had no local changes, you can do a
'git rebase --hard remotes/origin/master' to reset your local master back to
the repository's master.


I'm not sure if a force-push is still acceptable at this late stage, so this
would also be a good time to discuss force-push policies...


-Willem Jan