RetroSearch Browse

Thu Apr 14 01:58:56 CEST 2011 · https://mail.python.org/pipermail/python-dev/2011-April/110682.html

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

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://mail.python.org/pipermail/python-dev/2011-April/110682.html below:

[Python-Dev] cpython (merge default -> default): merge from push conflict.