From 33037d35c26edfbc86d2f6b1dc03f0d1467f476a Mon Sep 17 00:00:00 2001 From: Jo Humphrey <31373245+jamdelion@users.noreply.github.com> Date: Thu, 1 Aug 2024 13:07:38 +0100 Subject: [PATCH] fix: add pnpm version reminder to readme troubleshooting section --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 3870c2d93e..652f2bf647 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,8 @@ Once a deployment is completed, a Slack notification will be sent to the #planx- ### Troubleshooting +**Diverging branches** + If the commit history of `main` and `production` diverge and `production` contains commit hashes that are NOT on main, try running this command from `production` to reset and then follow the original deploy steps above: ```bash git reset --hard && git push --force @@ -121,6 +123,10 @@ git reset --hard && git push --force You'll have to temporarily turn off branch protection rules to make this change, so run it by another dev to confirm. +**Unmet peer dependencies** + +Make sure `pnpm` is installed globally at version 8.6.6 `pnpm add -g pnpm@8.6.6`, otherwise you may hit some unmet peer dependencies issues. + ## Audits ### Accessibility