From 36aceed52a282551f620e5413e82be6aab51d4b6 Mon Sep 17 00:00:00 2001
From: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Date: Tue, 30 Aug 2022 12:17:17 -0400
Subject: [PATCH] Add instructions (#2232)

* Add instructions

* Add ignore revs

* PR feedback
---
 .git-blame-ignore-revs |  9 +++++++++
 README.md              | 13 +++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index af12ea908..02b9803ea 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,2 +1,11 @@
 # Apply .NET format https://github.com/bitwarden/server/pull/1764
 23b0a1f9df25058ab29785ecad9a233113c10889
+
+# Turn on file scoped namespaces (gets reverted) https://github.com/bitwarden/server/pull/2225
+34fb4cca2aa78deb84d4cbc359992a7c6bba7ea5
+
+# Revert filescoped https://github.com/bitwarden/server/pull/2227
+bae03feffecbef488cb52f5f5bc133dfdbbaa316
+
+# Run formatting for file scoped namespaces https://github.com/bitwarden/server/pull/2230
+7f5f010e1eea400300c47f776604ecf46c4b4f2d
diff --git a/README.md b/README.md
index 70c0df360..eff0f170c 100644
--- a/README.md
+++ b/README.md
@@ -84,3 +84,16 @@ We recently migrated to using dotnet-format as code formatter. All previous bran
 5. Commit
 6. Run `git merge -Xours 23b0a1f9df25058ab29785ecad9a233113c10889`
 7. Push
+
+### File Scoped Namespaces
+
+We recently migrated to using file scoped namespaces to save some horizontal space. All previous branches will need to update to avoid large merge conflicts using the following steps:
+
+1. Check out your local Branch
+2. Run `git merge 9b7aef0763ad14e229b337c3b5b27cb411009792`
+3. Resolve any merge conflicts, commit.
+4. Run `dotnet format`
+5. Commit
+6. Run `git merge -Xours 7f5f010e1eea400300c47f776604ecf46c4b4f2d`
+7. Fix Merge conflicts
+8. Push