$ git merge -Xours branch-name $ git merge -XTheirs banch-name
Comes in really handy for sweeping updates, like running eslint --fix
on an entire code base or merging package-lock.json
.
<アンダブロッブ />
$ git merge -Xours branch-name $ git merge -XTheirs banch-name
Comes in really handy for sweeping updates, like running eslint --fix
on an entire code base or merging package-lock.json
.