Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-21 12:05:42 +01:00
Code Issues Projects Releases Wiki Activity

Add instructions (#2232)

Browse Source 
* Add instructions

* Add ignore revs

* PR feedback
This commit is contained in:
Justin Baur 2022-08-30 12:17:17 -04:00 committed by GitHub
parent 7f5f010e1e
commit 36aceed52a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.git-blame-ignore-revs
View File

@ -1,2 +1,11 @@
# Apply .NET format https://github.com/bitwarden/server/pull/1764 # Apply .NET format https://github.com/bitwarden/server/pull/1764
23b0a1f9df25058ab29785ecad9a233113c10889 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

13
README.md
View File

@ -84,3 +84,16 @@ We recently migrated to using dotnet-format as code formatter. All previous bran
5. Commit 5. Commit
6. Run `git merge -Xours 23b0a1f9df25058ab29785ecad9a233113c10889` 6. Run `git merge -Xours 23b0a1f9df25058ab29785ecad9a233113c10889`
7. Push 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