Browse Source

Add .git-blame-ignore-revs (#2240)

pull/2244/head
Oscar Hinton 5 months ago
committed by GitHub
parent
commit
a14fdc9b77
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .git-blame-ignore-revs
  2. 20
      README.md

2
.git-blame-ignore-revs

@ -0,0 +1,2 @@
# Apply Prettier https://github.com/bitwarden/browser/pull/2238
8fe821b9a3f9728bcb02d607ca75add468d380c1

20
README.md

@ -56,3 +56,23 @@ Manifests are located in the `browser` subdirectory of the Bitwarden configurati
Code contributions are welcome! Please commit any pull requests against the `master` branch. Learn more about how to contribute by reading the [`CONTRIBUTING.md`](CONTRIBUTING.md) file.
Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature. You can read our security policy in the [`SECURITY.md`](SECURITY.md) file.
## Prettier
We recently migrated to using Prettier as code formatter. All previous branches will need to updated to avoid large merge conflicts using the following steps:
1. Check out your local Branch
2. Run `git merge cebee8aa81b87cc26157e5bd0f879db254db9319`
3. Resolve any merge conflicts, commit.
4. Run `npm run prettier`
5. Commit
6. Run `git merge -Xours 8fe821b9a3f9728bcb02d607ca75add468d380c1`
7. Push
### Git blame
We also recommend that you configure git to ignore the prettier revision using:
```bash
git config blame.ignoreRevsFile .git-blame-ignore-revs
```
Loading…
Cancel
Save