[Scummvm-devel] force push

[Willem Jan Palenstijn]

Hi all,

The sherlock2 branch pulled in a series of commits that had been rebased away
before the merge of the main sherlock pull request. This caused a group of
commits to be duplicated, including a number of broken ones. (Which were the
reason for this rebase in the first place...)

Sadly, this happened two days ago already, so fixing this required a force push
of quite a significant block of history.

I've just force pushed master from 254e1a16e75957c4cf246d7bf31944324c822f7e to
d0a0f85fc524fc6e744c2a73c5c2413d411b4041.

Please make sure to update your local copies properly. (This is important; it
will not happen automatically.) If you have no local changes, the safest way is
doing a hard reset of your local master branch to the remote master branch.




And finally, if you're about to merge a complicated branch, please do consider
using a pull request or ask for review informally, to avoid things like this
happening again.



-Willem Jan