DEV/material-components_material-components-ios
1
0
Fork 0
mirror of https://github.com/material-components/material-components-ios.git synced 2026-01-09 07:11:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Git LFS] Fix .gitattributes in develop. (#8478)

Browse Source 
`.gitattributes` was accidentally merged back from `stable` to `develop`.

Prework for #8392
This commit is contained in:
Robert Moore 2019-09-23 11:08:47 -04:00 committed by GitHub
parent d8858723ef
commit 45609f6e6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.gitattributes vendored
View File

@ -1,25 +1,3 @@
# DO NOT CHANGE THIS FILE
# DO NOT EDIT THE LINE BELOW.
/.gitattributes merge=gitattributes
# DO NOT EDIT THE LINE ABOVE.
#
# You can of course edit this file, but make sure you understand what you are
# doing. This file defines a custom filter driver that prevents snapshot test
# images from being merged into `stable`. Snapshot test images are only
# valuable in `develop` because they are only intended to help developers
# identify changes in the appearance of the library.
#
# Before you change this file, please carefully consider whether such a change
# is actually necessary. When you do change this file, it should almost always
# be done in a dedicated commit directly on the `stable` branch and not part
# of a release. If you see this file being changed as part of a release,
# block the release and work with the releaser to ensure that the change needs
# to be propagated from the `develop` branch to the `stable` branch. In nearly
# all cases, it should not be propagated from `develop` to `stable`.
#
# If you are a releaser and see this file change and you're not sure why, you
# might have accidentally skipped [setting the correct
# driver in your cloned
# repository](https://github.com/material-components/material-components-ios/blob/develop/contributing/releasing.md#configure-the-merge-strategy-for-gitattributes).
# If that's the case, please either revert the accidental change manually or
# restart the release with a fresh clone and the correct driver.
# Do not merge this version into `stable`.
snapshot_test_goldens/**/*.png filter=lfs diff=lfs merge=lfs -text
.gitattributes merge=gitattributes