git fetch && git checkout main && git pull origin main
git branch try-finney-deploy-5-20-2024
git checkout try-finney-deploy-5-20-2024
git merge origin/testnet
now at the merge conflict step, manually copy paste over the repo with the current files from testnet,
finally:
git add --all
git merge --continue
this gives us a clean merge commit that upgrades main to exactly what is currently on testnet, while preserving the commits, without messing up the state like the other merge methods were
reproduction steps:
now at the merge conflict step, manually copy paste over the repo with the current files from
testnet,finally:
this gives us a clean merge commit that upgrades main to exactly what is currently on testnet, while preserving the commits, without messing up the state like the other merge methods were