bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00
Code Issues Releases Wiki Activity

Update README.md (#586)

Browse Source 
* Update README.md

* Replace header Git diff with Git blame
This commit is contained in:
Daniel James Smith
2021-12-16 14:38:11 +01:00
committed by GitHub
parent cf1d82ac66
commit 36b3aea758
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -24,12 +24,12 @@ We recently migrated to using Prettier as code formatter. All previous branches
1. Check out your local Branch 1. Check out your local Branch
2. Run `git merge 8b2dfc6cdcb8ff5b604364c2ea6d343473aee7cd` 2. Run `git merge 8b2dfc6cdcb8ff5b604364c2ea6d343473aee7cd`
3. Resolve any merge conflicts, commit. 3. Resolve any merge conflicts, commit.
4. Run `npm prettier` 4. Run `npm run prettier`
5. Commit 5. Commit
6. Run `git merge -Xours 193434461dbd9c48fe5dcbad95693470aec422ac` 6. Run `git merge -Xours 193434461dbd9c48fe5dcbad95693470aec422ac`
7. Push 7. Push
### Git diff ### Git blame
We also recommend that you configure git to ignore the prettier revision using: We also recommend that you configure git to ignore the prettier revision using: