GitHub/SwiftLint
1
0
Fork 0
mirror of https://github.com/realm/SwiftLint.git synced 2026-05-07 20:12:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
0e6d19b4c1906e6fbf396172e9a0a22acdf6f86c
SwiftLint/.gitattributes
T
JP Simard 99f6430838 perform union merges on CHANGELOG.md 
this should resolve conflicts more sensibly

See https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/
for details
2017-02-09 17:11:45 -08:00

2 lines
25 B
Plaintext
Raw Blame History

CHANGELOG.md merge=union
Reference in New Issue View Git Blame Copy Permalink