RetroSearch Browse

Mon Mar 23 22:47:53 CET 2009 · http://mail.python.org/pipermail/python-dev/2009-March/087462.html

Martin v. Löwis wrote:
> P.P.S. Are you sure you have to re-merge when somebody commits
> something unrelated to the branch? Or just when somebody else merges
> as well?

The latter is the only one I've ever had problems with (and that was due
to me forgetting to update before merging rather than someone else
actually doing a concurrent merge).

Cheers,
Nick.

-- 
Nick Coghlan   |   ncoghlan at gmail.com   |   Brisbane, Australia
---------------------------------------------------------------

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

Showing content from http://mail.python.org/pipermail/python-dev/2009-March/087462.html below:

[Python-Dev] GSoC: Core Python development tools