Steps for merging an old branch into a newly prettier-ified codebase. Use at your own risk, verify everything was correctly merged.

prettier-branch.sh

# Assumes 3 sequential commits:
#
# 1. commit tagged "prettier-before" that added `prettier` depedency and `prettier` script your package.json
# 2. commit that actually ran `prettier` on your entire codebase for the first time
# 3. commit tagged "prettier-after" that fixes any minor issues caused by prettier (e.x. moving eslint-ignore or $FlowFixMe comments around), or just the next commit if there were none
#
# I recommend running these as individual commands, not as a script, in case of merge conflicts
# In the sweepbright app this commits have the following hashes
# $prettier-before 👉 352f43227d9ae5de0de92b48158d0f02feb7588c
# $prettier-after 👉 5330ac90e7adf6f0867228680686f6aaedd8b065
# Checkout the non-pretty branch you want to merge
# (or optionally make a new branch with `git checkout -b $YOUR_BRANCH-prettier $YOUR_BRANCH`)
git checkout $YOUR_BRANCH
# Merge the commit immediately prior to running prettier globally:
git merge 352f43227d9ae5de0de92b48158d0f02feb7588c
# Manually resolve conflicts if necessary, then commit if necessary
# Save a list of changed files between that commit and your branch pre-prettier as a sanity check
git diff --name-only prettier-before > prettier-before.diff
# Update the dependencies and run `prettier` on your branch:
yarn
yarn run prettier
# Commit the results
git commit -a -m "Run prettier on $YOUR_BRANCH"
# Cherry-pick the commit after you ran prettier
git cherry-pick 5330ac90e7adf6f0867228680686f6aaedd8b065
# Then merge with same commit
git merge -Xours 352f43227d9ae5de0de92b48158d0f02feb7588c
# Merge with master (or any commit after `prettier-after`):
git merge develop
# Run lint/flow/tests, if applicable
yarn lint && yarn flow && yarn test