Re: [jboss-as7-dev] Don't pull from master!
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(a)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