From e08b65f62b04ff0e46fb8e7e45ec8875214d23f3 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <hinton.oscar@gmail.com>
Date: Thu, 5 May 2022 21:59:17 +0200
Subject: [PATCH] Add instructions on how to migrate desktop PRs (#2636)

* Add instructions on how to migrate desktop PRs

* Fix instructions
---
 README.md               | 25 +++++++++++++++++++++++++
 apps/desktop/.gitignore | 18 ++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 apps/desktop/.gitignore

diff --git a/README.md b/README.md
index 4094b1c20c..ffe14e1c74 100644
--- a/README.md
+++ b/README.md
@@ -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
+```
diff --git a/apps/desktop/.gitignore b/apps/desktop/.gitignore
new file mode 100644
index 0000000000..1781b9ed5e
--- /dev/null
+++ b/apps/desktop/.gitignore
@@ -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/