如何将我的 git 远程分支恢复到 IntelliJ 中的先前提交？

Question

I had already one PULL Request. After rebasing my feature branch with the master I changed some files and commit it and pushed into my remote feature branch. During push IntelliJ told me to rebase the local branch, I did it and resolved the conflict. But after the next push, my pull request shows so many file changes and lots of commits, That I did not commit. How to get rid of this.

Answer 1

I think the easiest solution would be to create another branch off of master (or whatever your PR is going into) and do a git merge --squash to make it a single new commit then restart your PR.