Skip to content

Monthly Archives: October 2018

ESLint disable rule for the whole file: /* eslint-disable */

31-Oct-18

While rules can be disabled for a line with // eslint-disable-line [rule-name] the whole file disabling needs block comments: /* eslint-disable [rule-name] */

Conflicting package-lock.json in Git?

30-Oct-18

Include package-lock.json in your git repository, but try to commit it alone (to avoid noise in diffs). When encountering conflicts during merge: npm install --package-lock-only As running that command then suggests, you might also want to consider automating the process by installing npm-merge-driver (npx npm-merge-driver install -g).

Cancel Conflicting Git Merge (--ABORT)

30-Oct-18

Your keyword here is abort. git merge --abort