[Python-Dev] cpython (merge default -> default): merge from push conflict. (original) (raw)
Senthil Kumaran orsenthil at gmail.com
Thu Apr 14 01:58:56 CEST 2011
- Previous message: [Python-Dev] cpython (merge default -> default): merge from push conflict.
- Next message: [Python-Dev] python and super
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
On Wed, Apr 13, 2011 at 08:24:32PM +0200, Georg Brandl wrote:
> summary: > merge from push conflict.
this message is not quite correct -- there is no conflict involved. You're just merging two heads on the same branch in order to have only one head in the master repo.
Okay, got it. I should have just said merge. (I probably typed push conflict, because push was not allowed as some had already pushed to repo in quick succession), it is just a merge.
Thanks, Senthil
- Previous message: [Python-Dev] cpython (merge default -> default): merge from push conflict.
- Next message: [Python-Dev] python and super
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]