mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-05-24 21:08:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: improve package-lock.json merging

Browse Source 
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.
This commit is contained in:
Christopher Hiller
2022-12-02 15:14:03 -08:00
parent 3e99ae185b
commit 88defdf0fe
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+3
View File
@@ -1 +1,4 @@
* text=auto eol=lf
# Handle as a text file but merge as binary.
package-lock.json merge=binary