A minimal example of applying two-step strategy to format the whole codebase under GitFlow branching model without introducing extra merge conflicts
Clone or download
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Type Name Latest commit message Commit time
Failed to load latest commit information.
.gitignore
README.md
index.js
package.json
yarn.lock

README.md

format-whole-codebase-playground

A codebase formatting example accompanying this blog post on two-step-formatting

Formatting setup

yarn
npx prettier --write index.js

branch specification

branch name formatted description
master original master branch
develop original develop branch
prettier-master original master branch formatted
prettier-develop original develop branch formatted
develop-merge-master original develop branch merged with master branch
prettier-develop-merge-master original develop branch merged with master branch, then formatted
prettier-master-merge-develop original develop branch merged with master branch, then merged with prettier-master, conflicts resolved, then formatted