Skip to content

Conversation

lesteve
Copy link
Member

@lesteve lesteve commented Apr 6, 2022

Close #21516.

As noted in #21516 this does not seem that useful in practice (there are still conflicts to fix for users because Github has not implemented it: #21516 (comment)) and cause caveats creating duplicated or weirdly ordered whats_new entries.

@lesteve lesteve changed the title Remove merge=union gitattributes for whats_new merge strategy Remove merge=union gitattributes for whats_new merge files Apr 6, 2022
@lesteve lesteve changed the title Remove merge=union gitattributes for whats_new merge files Remove merge=union gitattributes for whats_new files Apr 6, 2022
@lesteve lesteve changed the title Remove merge=union gitattributes for whats_new files MNT remove merge=union gitattributes for whats_new files Apr 6, 2022
Copy link
Member

@thomasjpfan thomasjpfan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jeremiedbb jeremiedbb merged commit 41b8f84 into scikit-learn:main Apr 6, 2022
@jeremiedbb
Copy link
Member

thanks @lesteve

jjerphan pushed a commit to jjerphan/scikit-learn that referenced this pull request Apr 29, 2022
@lesteve lesteve deleted the remove-gitattributes branch March 31, 2023 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Revisit gitattributes merge=union
3 participants