From 770a341a61a3f360b6e30d8dbd77e1bf6f31f207 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Thu, 16 Feb 2023 16:24:01 +0100 Subject: [PATCH] Remove file scoped namespaces instructions (#2708) --- README.md | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/README.md b/README.md index e6c0dcd85..a3996383c 100644 --- a/README.md +++ b/README.md @@ -80,16 +80,3 @@ Consider installing our git pre-commit hook for automatic formatting. ```bash git config --local core.hooksPath .git-hooks ``` - -### 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