在git amend和git push --force之后安全删除提交

Question

I am not a git expert and I am trying to save code that I am working on. I wanted to rename the most recent commit by following the steps described here . Particularly, I first ran

git commit --amend

to correct misspelled commit message using a text editor locally, then

git push --force

to update GitHub repository. Everything went well except that I still have a (I believe, sorry for a bad terms) upstream changes labeled red in git gui:

That say

Local uncommitted changes, not checked in to index

This red labeled changes are the same as my recently amended commit. Running git pull just says that

Already up to date

So, my question is how to remove those 'duplicate' changes? (node labelled red on the picture above). I am afraid that running: git reset --hard HEAD^ will just remove the last amended commit

Answer 1

I solved this issue by simply making changes to the file that was in upstream node (labelled red) captioned

Local uncommitted changes, not checked in to index

and committed it.

The "Local uncommitted changes, not checked in to index" were overridden by my new commit