From b140d5f1b68d47be4e8d3535f7701a53f8ced499 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Thu, 16 Feb 2023 16:11:38 +0100 Subject: [PATCH] Remove migration details from the readme (#4780) --- README.md | 88 ------------------------------------------------------- 1 file changed, 88 deletions(-) diff --git a/README.md b/README.md index f8fb306cfa..df1f22a094 100644 --- a/README.md +++ b/README.md @@ -42,91 +42,3 @@ Interested in contributing in a big way? Consider joining our team! We're hiring Code contributions are welcome! Please commit any pull requests against the `master` branch. Learn more about how to contribute by reading the [Contributing Guidelines](https://contributing.bitwarden.com/contributing/). Check out the [Contributing Documentation](https://contributing.bitwarden.com/) for how to get started with your first contribution. 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. - -## 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 -``` - -### CLI - -``` -# Merge master -git merge master - -# Merge branch mono-repo-prep -git merge 980429f4bdcb178d8d92d8202cbdacfaa45c917e - -# Verify files are placed in apps/cli - -# 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 -``` - -### Web - -``` -# Merge master -git merge master - -# Merge branch mono-repo-prep -git merge 02fe7159034b04d763a61fcf0200869e3209fa33 - -# Verify files are placed in apps/web - -# 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 -``` - -### Jslib - -``` -# Merge master -git merge master - -# Merge branch mono-repo -git merge d7492e3cf320410e74ebd0e0675ab994e64bd01a - -# Verify files are placed in libs - -# 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 -```