From afbf6529c1838dba203ca910a708ff2a7f21ba2e Mon Sep 17 00:00:00 2001
From: Oscar Hinton <oscar@oscarhinton.com>
Date: Mon, 20 Dec 2021 18:15:11 +0100
Subject: [PATCH] Add .git-blame-ignore-revs (#427)

---
 .git-blame-ignore-revs |  2 ++
 README.md              | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 .git-blame-ignore-revs

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 00000000000..973c5531a10
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Apply Prettier https://github.com/bitwarden/cli/pull/426
+910b4a24e649f21acbf4da5b2d422b121d514bd5
diff --git a/README.md b/README.md
index 72ef0c74f9f..de74ba8996e 100644
--- a/README.md
+++ b/README.md
@@ -87,3 +87,23 @@ node ./build/bw.js login
 Code contributions are welcome! Please commit any pull requests against the `master` branch. Learn more about how to contribute by reading the [`CONTRIBUTING.md`](CONTRIBUTING.md) file.
 
 Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature. You can read our security policy in the [`SECURITY.md`](SECURITY.md) file.
+
+## Prettier
+
+We recently migrated to using Prettier as code formatter. All previous branches will need to updated to avoid large merge conflicts using the following steps:
+
+1. Check out your local Branch
+2. Run `git merge ec53a16c005e0dd9aef6845c18811e8b14067168`
+3. Resolve any merge conflicts, commit.
+4. Run `npm run prettier`
+5. Commit
+6. Run `git merge -Xours 910b4a24e649f21acbf4da5b2d422b121d514bd5`
+7. Push
+
+### Git blame
+
+We also recommend that you configure git to ignore the prettier revision using:
+
+```bash
+git config blame.ignoreRevsFile .git-blame-ignore-revs
+```