最初,我为我的功能分支创建了一个新的PR,它有2个提交。我的目标是将这两个提交压缩成一个。
因此,在处理我的功能分支时,我执行了以下命令:
$ git fetch origin
$ git rebase -i HEAD~2
A new file opened, I saw a lot of lines. For every line except the
first, changed “pick” to “squash”. Saved and closed.
Another file opened, I edited the commit messages
$ git rebase origin/master
---> I got conflicts that I resolved
$ git push -u --force-with-lease origin feature_branch_name
当我去github并推送“比较和拉动请求”时,新PR包含了很多改变。
我如何在PR中排除其他人的更改?