Production deploy failed. Resolve by SSH & resolve git conflicts.

Sometimes when I deploy to production on laravel forge, the deploy fails with a message about "divergent branches" like this: https://share.cleanshot.com/F4Xf2s1M

Jason Beggs helped me troubleshoot and showed me how to do it myself in the future, in this Clarifyflow thread.

Steps to fix:

1-- SSH into the server by running this:

ssh forge@167.99.15.147

It will ask me for a password for my SSH key. I saved this in 1Password under SSH Keys. Copy and paste it into terminal.

2--cd to production

Once you're SSH'd in... to work on the production app (not staging), run this

cd clarityflow.com

3-- run git pull --ff

Run git pull --ff to pull the changes from GitHub and resolve conflicts if there are any

git pull --ff

4-- run git push

Run git push to push up the changes from production

git push

5-- Trigger a deploy on Forge

Trigger a deploy on Forge to make sure all the deploy scripts run

• In Forge, click the "Deploy" button.