From 239286737d15cb84a893703ee5a8b33a2d67ad3d Mon Sep 17 00:00:00 2001
From: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Date: Mon, 29 Aug 2022 15:27:55 -0400
Subject: [PATCH] Add git blame entry (#2226)

* Add entry and instructions

* Change wording

* Added step for resolving conflicts
---
 .git-blame-ignore-revs |  3 +++
 README.md              | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index af12ea908..307748073 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,2 +1,5 @@
 # Apply .NET format https://github.com/bitwarden/server/pull/1764
 23b0a1f9df25058ab29785ecad9a233113c10889
+
+# Turn on file scoped namespaces https://github.com/bitwarden/server/pull/2225
+34fb4cca2aa78deb84d4cbc359992a7c6bba7ea5
diff --git a/README.md b/README.md
index 70c0df360..8469bdc31 100644
--- a/README.md
+++ b/README.md
@@ -84,3 +84,15 @@ 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 have switched to using file scoped namespace. All previous branches will need to update to avoid large merge conflicts using the following steps:
+
+1. Check out your local Branch
+1. Run `git merge 7c4521e0b428d523f2153cda3fb51d51bca9f194`
+2. Resolve any merge conflicts, commit.
+3. Run `dotnet format`
+4. Commit
+5. Run `git merge -Xours 34fb4cca2aa78deb84d4cbc359992a7c6bba7ea5`
+6. Resolve merge conflicts
+7. Push