Message 197222 - Python tracker

➜

This issue tracker has been migrated to GitHub , and is currently read-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

In-reply-to
Author	r.david.murray
Recipients	ncoghlan, r.david.murray
Date	2013年09月08日.04:51:41
SpamBayes Score	-1.0
Marked as misclassified	Yes
Message-id	<1378615901.42.0.388327364883.issue18967@psf.upfronthosting.co.za>

Content
For what it is worth, I haven't had a non-trivial merge conflict on Misc/NEWS for quite some time now. It seems to me that they are much rarer than they were with svn. (By 'trivial' I mean that the conflicts I see is that there's a new entry on 3.4 that wasn't in 3.3, and the conflict is just the addition of the new entry in the merge, which is trivial to fix.)

Content

For what it is worth, I haven't had a non-trivial merge conflict on Misc/NEWS for quite some time now. It seems to me that they are much rarer than they were with svn. (By 'trivial' I mean that the conflicts I see is that there's a new entry on 3.4 that wasn't in 3.3, and the conflict is just the addition of the new entry in the merge, which is trivial to fix.)

History
Date	User	Action	Args
2013年09月08日 04:51:41	r.david.murray	set	recipients: + r.david.murray, ncoghlan
2013年09月08日 04:51:41	r.david.murray	set	messageid: <1378615901.42.0.388327364883.issue18967@psf.upfronthosting.co.za>
2013年09月08日 04:51:41	r.david.murray	link	issue18967 messages
2013年09月08日 04:51:41	r.david.murray	create

homepage