Skip to content

Instantly share code, notes, and snippets.

@briangonzalez

briangonzalez/fix-conflicts.sh

Created June 25, 2017 13:48
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save briangonzalez/e0c9fb3e1751ade04ba75f8a1b99d781 to your computer and use it in GitHub Desktop.
Save briangonzalez/e0c9fb3e1751ade04ba75f8a1b99d781 to your computer and use it in GitHub Desktop.
Download ZIP
Fixing conflicts caused by merging in master with eslint changes
Raw
fix-conflicts.sh
git checkout master
git pull
git checkout my-branch
git rebase master
# Get conflicts, flip a table.
# (╯°□°）╯︵
git checkout . --theirs # we don't care about what's in master, we just want our files and we'll fix eslint errors ourselves
./node_modules/.bin/eslint . --fix
# Do a little spot checking at this point to make sure you don't have semi-colons.
git add .
git rebase --continue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment