Issue 29978: Remove remove merge=union attribute for Misc/NEWS in 3.6 and 2.7

➜

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.

This issue has been migrated to GitHub: https://github.com/python/cpython/issues/74164

classification

Title:	Remove remove merge=union attribute for Misc/NEWS in 3.6 and 2.7
Type:		Stage:	resolved
Components:		Versions:	Python 3.6, Python 2.7

process

Status:	closed	Resolution:	fixed
Dependencies:		Superseder:
Assigned To:	Mariatta	Nosy List:	Mariatta
Priority:	normal	Keywords:

Created on 2017-04-04 08:40 by Mariatta, last changed 2022-04-11 14:58 by admin. This issue is now closed.

Pull Requests
URL	Status	Linked	Edit
PR 988	merged	Mariatta, 2017-04-04 09:01
PR 989	merged	Mariatta, 2017-04-04 09:46

Messages (1)
msg291115 - (view)	Author: Mariatta (Mariatta) *	Date: 2017-04-04 08:40
In https://github.com/python/cpython/pull/212, merge=union was added to the .gitattributes, but was later removed in https://github.com/python/cpython/pull/460. Somehow this attribute made their way into 3.6 and 2.7. I will remove it.

msg291115 - (view)

Author: Mariatta (Mariatta) * (Python committer)

Date: 2017-04-04 08:40

In https://github.com/python/cpython/pull/212, merge=union was added to the .gitattributes, but was later removed in https://github.com/python/cpython/pull/460.

Somehow this attribute made their way into 3.6 and 2.7.

I will remove it.

History
Date	User	Action	Args
2022-04-11 14:58:44	admin	set	github: 74164
2017-04-04 12:49:50	Mariatta	set	status: open -> closed resolution: fixed stage: needs patch -> resolved
2017-04-04 09:46:35	Mariatta	set	pull_requests: + pull_request1160
2017-04-04 09:01:09	Mariatta	set	pull_requests: + pull_request1159
2017-04-04 08:40:54	Mariatta	create