adamlutz · May 15, 2025 18:47
diff --git a/gistfile1.txt b/gistfile1.txt
 git merge-base HEAD origin/main
 git reset --soft <commit-hash-from-previous-step>
 git commit -a -m "Squash commit, the one that will show up"
 git push origin --force-with-lease
	git merge-base HEAD origin/main
	git reset --soft <commit-hash-from-previous-step>
	git commit -a -m "Squash commit, the one that will show up"
	git push origin --force-with-lease