Revisit gitattributes merge=union · Issue #21516 · scikit-learn/scikit-learn · GitHub

8000 Revisit gitattributes merge=union · Issue #21516 · scikit-learn/scikit-learn · GitHub

Revisit gitattributes merge=union #21516

Closed

Closed

Revisit gitattributes merge=union#21516

Labels

I have been seeing the default merge result in diffs looking like: https://github.com/scikit-learn/scikit-learn/pull/18975/files#diff-5a8a66bfe0792b4a0e50eb7c8cc929f2a8e0d4d88ac2d0084e07b70d069ced89. In this case, the changelog for #21130 was moved into 1.0 as a bug fix.

I'm not sure what a good way is to handle this use case. WDYT @lesteve ?

Metadata

Assignees

No one assigned

Labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

0