How to merge the last 2 commits?

Question

git

I pushed the changes to the server, after that I saw that I forgot to add something, made changes on the LAN and pushed it again. Now there are 2 separate commits on the server for one task. How to combine them into one?

Answer 1

git reset --soft HEAD~2
git commit -a -m 'join'
git push origin <branch>  --force

more or less like this

Answer 2

wiki.rosalab.ru/ru/index.php/%D0%91%D0%BB%D0%BE%D0...