[Scummvm-devel] git force-push

Willem Jan Palenstijn wjp at usecode.org
Tue May 17 13:58:46 CEST 2011

On Tue, May 17, 2011 at 01:48:24PM +0200, Max Horn wrote:
> Am 17.05.2011 um 00:19 schrieb Willem Jan Palenstijn:
> > Hi all,
> > 
> > Hopefully nobody noticed, but in case anybody is affected, Johannes did a
> > force-push of master to d47eceeb2fdd122efb143d00097c0cf159552bb2 a little
> > while ago to correct a merge gone wrong at
> > 15ea9b15cbb1210b14490819c5bc04f72ed7e6c8.
> Anyhow, is somebody working on getting the real commits behind that failed
> push into the tree now?

I made a quick attempt last night at https://github.com/wjp/scummvm/commits/fix/
, but would like to hear from Florian.

That branch includes a suggestion by Johannes to squash together the 'detune'
commits since those first increased and then decreased the savegame version

At a quick glance it looks like it could benefit from some more squashing, but
that's more of a subjective matter.

-Willem Jan

More information about the Scummvm-devel mailing list