我需要删除一些提交从远程,那些显示后,有时合并。
Mar 23 abcd999 some message
Mar 11 abcd123 some message
Feb 12 xyze456 merged in feature (not required)
Feb 6 98y65r4 merged in develop (not required)
Jan 20 987xcrt 2nd commit
Jan 5 45345rt initial commit
然而,我不希望历史被改变。我尝试过各种方法,但是所有的方法都改变了历史和a
我意外地做了git pull而不是git push,并出现了合并冲突。我很惊讶git尝试了一个合并,因为自从我上次拉/推之后,远程分支没有收到任何提交。因为我不想做拉/合并,所以我做了git reset --hard,然后是git merge --abort。我试着推,但得到了这样的信息:
On branch my_branch
Your branch and 'origin/my_branch' have diverged,
and have 17 and 1 different commit each, respectively.
(use "git pull&