cd ~/code/uppy
git checkout main
git status
# make sure to have a clean working tree
git pull
yarn # you now have the node_modules from main, this includes the linting modules
git checkout $myBranch # e.g. `golden-retriever-ghosts-2`
git checkout main -- .eslintrc.js
git add .eslintrc.js
git commit --no-verify --message 'import .eslintrc from main'
./node_modules/.bin/eslint --quiet --fix .
git commit -am 'autofix'Your branch now has all the linting applied was also done in main.
You could of course still get merge conflicts, but they shouldn't be due to the mass linting change that was done. So you can now run this like you would normally:
git merge main