[jboss-as7-dev] Don't pull from master!

[Benjamin Browning]

You should never, ever do this on a shared git repo :(

On May 26, 2011, at 10:12 AM, Kabir Khan wrote:

> Hi,
> 
> That is what we ended up doing, I just wanted to check with the others and make double sure I did not break anything again. 
> 
> For anybody who got the bad commit 
> 43d53e805ca8fbdd83fda496d0119ab32ad2a711 Merge branch 'master' of https://github.com/jbossas/jboss-as 
> 
> you MUST do a 
> git pull --rebase upstream master
> 
> or if you don't have any local changes:
> git fetch upstream; git reset --hard upstream/master
> 
> On 26 May 2011, at 14:52, Thomas Diesler wrote:
> 
>> The quickest would be
>> 
>>> git checkout master
>>> git reset --hard <last-good-commit>
>>> git push origin -f master
>> 
>> cheers
>> -thomas
>> 
>> On 05/26/2011 03:13 PM, Kabir Khan wrote:
>>> Master is in an inconsistent state due to me accidentally having pulled in a merge commit, and I'm looking at how to restore it. If you rebase onto master now we will end up in a mess again.
>>> _______________________________________________
>>> jboss-as7-dev mailing list
>>> jboss-as7-dev at lists.jboss.org
>>> https://lists.jboss.org/mailman/listinfo/jboss-as7-dev
>> 
>> -- 
>> xxxxxxxxxxxxxxxxxxxxxxxxxxxx
>> Thomas Diesler
>> JBoss OSGi Lead
>> JBoss, a division of Red Hat
>> xxxxxxxxxxxxxxxxxxxxxxxxxxxx
>> 
>> _______________________________________________
>> jboss-as7-dev mailing list
>> jboss-as7-dev at lists.jboss.org
>> https://lists.jboss.org/mailman/listinfo/jboss-as7-dev
> 
> 
> _______________________________________________
> jboss-as7-dev mailing list
> jboss-as7-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/jboss-as7-dev