mirror of
https://github.com/appium/appium.git
synced 2026-01-11 12:50:06 -06:00
88defdf0fe
So what this does is treats `package-lock.json` as a text file _except_ when attempting to merge. The result will be that if `package-lock.json` is in a conflicted state, it will not contain conflict markers within the file itself like a regular text file would; it will only have the "conflicted" flag set by git. This means that to resolve a conflict in `package-lock.json` going forward, all one needs to do is run `npm install && git add -A package-lock.json`, as `npm` will fix `package-lock.json` itself. In theory.
5 lines
96 B
Plaintext
5 lines
96 B
Plaintext
* text=auto eol=lf
|
|
|
|
# Handle as a text file but merge as binary.
|
|
package-lock.json merge=binary
|