[Scummvm-devel] git force-push

[Filippos Karapetis]

IMHO, this was a very good reason for a force push, as the tree history was
messed severely
(i.e. there were three sets of the same commits, as the same changes were
rebased. As
you said "this was a rebase of remote/master on top of master, followed by a
merge of
master and remote/master". The result wasn't pretty :/ Thus, this was one of
the cases
where fixing history like that was a good thing (and a lot of people on IRC
agreed on this, too).

In any case, since I was one of the people affected by this: one solution to
fix your local
tree if you got these odd commits is to perform a hard reset of master
before the oddness
happened, and then do a force fetch and rebase.

Regards
Filippos

On Mon, Feb 28, 2011 at 10:36 PM, Willem Jan Palenstijn <wjp at usecode.org>wrote:

> Hi all,
>
> I hope this won't happen often, but I just did a force-push of master from
> 0f7dcac15591c4ea3def6ff16bb8cf0d6321809c back to
> 3550e1056884995a524db51fab56d0097c5b6398 to undo a broken merge after quick
> deliberation on IRC. The merge merged a rebased copy of master with master,
> duplicating 7 commits. The removed commit was up for 8 minutes, so
> hopefully
> not many people were affected other than those involved on IRC.
>
> If you run into trouble because of this, please let me know and we can
> figure
> out what to do to fix it.
>
>
> Any discussion on if this was an appropriate use of a force-push is
> welcome...
>
>
> -Willem Jan
>
>
> ------------------------------------------------------------------------------
> Free Software Download: Index, Search & Analyze Logs and other IT data in
> Real-Time with Splunk. Collect, index and harness all the fast moving IT
> data
> generated by your applications, servers and devices whether physical,
> virtual
> or in the cloud. Deliver compliance at lower cost and gain new business
> insights. http://p.sf.net/sfu/splunk-dev2dev
> _______________________________________________
> Scummvm-devel mailing list
> Scummvm-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-devel
>



-- 
"Experience is the name every one gives to their mistakes" - Oscar Wilde
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.scummvm.org/pipermail/scummvm-devel/attachments/20110301/bdbde46a/attachment.html>