> package-lock.json merge=ours This strikes me as a bad idea. Which side of the merge is “ours” and which ond is “theirs” during merges or rebases is something

> package-lock.json merge=ours This strikes me as a bad idea. Which side of the merge is “ours” and which ond is “theirs” during merges or rebases is something of a crapshoot[1], so this kind of setting only makes sense when merge conflicts are only ever discovered and resolved by automatic tooling (e.g. the git-annex branch[2] in git-annex-enabled repos). [1] https://stackoverflow.com/questions/25576415/what-is-the-precise-meaning-of-ours-and-theirs-in-git https://stackoverflow.com/questions/25576415/what-is-the-pre... [2] https://git-annex.branchable.com/internals/#index2h2 https://git-annex.branchable.com/internals/#index2h2