[Python-Dev] GSoC: Core Python development tools
Nick Coghlan
ncoghlan at gmail.com
Mon Mar 23 22:47:53 CET 2009
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
---------------------------------------------------------------
More information about the Python-Dev
mailing list