I would suggest not pushing or pulling from the repo

I accidently pushed a merge from 3.3 to default in the "3.3" branch. I think I'm going to have to strip it.
-- Regards, Benjamin

The other option is you could 'close' the unwanted head and create a new head at the point before the unwanted merge.
-----Original Message----- From: python-committers [mailto:python-committers- bounces+jaraco=jaraco.com@python.org] On Behalf Of Benjamin Peterson Sent: Monday, 15 July, 2013 23:08 To: python-committers Subject: [python-committers] I would suggest not pushing or pulling from the repo
I accidently pushed a merge from 3.3 to default in the "3.3" branch. I think I'm going to have to strip it.
-- Regards, Benjamin
python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers

There's no unwanted head to close. It's all on the 3.3 branch.
2013/7/15 Jason R. Coombs <jaraco@jaraco.com>:
The other option is you could 'close' the unwanted head and create a new head at the point before the unwanted merge.
-----Original Message----- From: python-committers [mailto:python-committers- bounces+jaraco=jaraco.com@python.org] On Behalf Of Benjamin Peterson Sent: Monday, 15 July, 2013 23:08 To: python-committers Subject: [python-committers] I would suggest not pushing or pulling from the repo
I accidently pushed a merge from 3.3 to default in the "3.3" branch. I think I'm going to have to strip it.
-- Regards, Benjamin
python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
-- Regards, Benjamin

Okay, I fixed the repo. You may need to strip your repo per my last mail.
2013/7/15 Benjamin Peterson <benjamin@python.org>:
I accidently pushed a merge from 3.3 to default in the "3.3" branch. I think I'm going to have to strip it.
-- Regards, Benjamin
-- Regards, Benjamin

Le lundi 15 juillet 2013 à 20:49 -0700, Benjamin Peterson a écrit :
Okay, I fixed the repo. You may need to strip your repo per my last mail.
I'm a bit wary of what might happen on automated stuff (i.e. buildbots).
Regards
Antoine.
participants (3)
-
Antoine Pitrou
-
Benjamin Peterson
-
Jason R. Coombs