vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Add instructions on how to migrate desktop PRs (#2636) 

* Add instructions on how to migrate desktop PRs

* Fix instructions
This commit is contained in:
Oscar Hinton 2022-05-05 21:59:17 +02:00 committed by GitHub
parent 55d2a6b503
commit e08b65f62b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
README.md
View File

@ -44,3 +44,28 @@ We recommend that you configure git to ignore specific revision using:
```bash
git config blame.ignoreRevsFile .git-blame-ignore-revs
```
## Migrate PRs from old repositories
We recently migrated from individual client repositories. And some PRs were unfortunately left behind in the old repositories. Luckily it's fairly straightforward to sync them up again. Please follow all the instructions below in order to avoid most merge conflicts.
### Desktop
```
# Merge master
git merge master
# Merge branch mono-repo-prep
git merge 28bc4113b9bbae4dba2b5af14d460764fce79acf
# Verify files are placed in apps/desktop
# Add remote
git remote add clients git@github.com:bitwarden/clients.git
# Merge against clients master
git fetch clients
git merge clients/master
# Push to clients or your own fork
```

18
apps/desktop/.gitignore vendored Normal file
View File

@ -0,0 +1,18 @@
.vs
.idea
node_modules
npm-debug.log
vwd.webinfo
dist/
dist-safari/
css/
*.crx
*.pem
build/
yarn-error.log
.DS_Store
*.nupkg
*.provisionprofile
*.env
PlugIns/safari.appex/
PlugIns/safari-legacy.appex/