nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

Remove file scoped namespaces instructions (#2708)

Browse Source
This commit is contained in:
Oscar Hinton 2023-02-16 16:24:01 +01:00 committed by GitHub
parent 6da1b87e00
commit 770a341a61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -80,16 +80,3 @@ Consider installing our git pre-commit hook for automatic formatting.
```bash ```bash
git config --local core.hooksPath .git-hooks 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