How to fix commits?

Question

git

made a minor commit on github, and then on a local project, without downloading the updated project from github. I'm trying to upload, but want to update the branch. I upload using pull, but all changes are deleted. How to add an old commit from github, but move to a new one from a local project? (Not really in this question, sorry for the wording)

Answer 1

did this:
git pull origin master
git mergetool
git push origin HEAD:refs/heads/bf66cec

Answer 2

git add .
git commit -m "commit name"
git pull
// если есть конфликты, они разруливаются и коммитятся вот тут
git push