Git-已提交和推送的更改中的文件需要取消提交

Question

On a separate branch as a pull request I have committed and pushed some system and project environment files. They cause huge issues for other developers because they are my system files interfering with their system files. How can I remove those files from that PR?

Answer 1

Suppose you modified the files on my-branch~3:

git checkout my-branch~3
git checkout HEAD~1 -- some-file.txt some-file2.txt
git commit --amend --no-edit # amend revision, those files will be as they were on previous revision
git cherry-pick my-branch~3..my-branch # rewrite remaining history of branch
# check the branch to make sure everything is of
# if it is... continue with the recipe
git branch -f my-branch #move branch pointer to new rewritten branch
git checkout my-branch
git push --force origin my-branch # adjust name of branch and remote