I have checked a number of questions about the difference between a git rebase
and git merge
, however, I did not find an answer for my specific case where I tried to rebase my feature branch with master
and after doing git rebase master
from my feature branch, it asked me to do a git pull
and that resulted in a merge of master to my branch.
Can someone explain why did this happen? Also, did a git revert -m2 <MERGE HASH>
and it seemed to revert the merge, but so many other things is out of sync now.
没有评论:
发表评论