Skip to content

Commit

Permalink
Remove file scoped namespaces instructions (#2708)
Browse files Browse the repository at this point in the history
  • Loading branch information
Hinton authored Feb 16, 2023
1 parent 6da1b87 commit 770a341
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 770a341

Please sign in to comment.