How to easily choose theirs or ours for git conflict

Sometimes files like package-lock.json you just want to bring the upstream changes in wholesale.

$ git checkout --theirs -- [filename]

$ git checkout --theirs -- package-lock.json

More ready

https://stackoverflow.com/questions/914939/simple-tool-to-accept-theirs-or-accept-mine-on-a-whole-file-using-git