Welcome to OGeek Q&A Community for programmer and developer-Open, Learning and Share
Post an Article
Welcome To Ask or Share your Answers For Others

Categories

git 提交代码时会把别人提交过的重复提交一遍

0 votes
4.2k views
in Technique[技术] by (71.8m points)

git 提交代码时会把别人提交过的重复提交一遍

如图，我在合代码时有冲突，解决冲突后发现把别人提交过的重复提交了一遍，具体操作忘记了，可能是什么原因？

image.png


与恶龙缠斗过久,自身亦成为恶龙；凝视深渊过久,深渊将回以凝视…
Welcome To Ask or Share your Answers For Others

1 Reply

0 votes
by (71.8m points)

是不是用了git rebase的命令进行的合并？
注意：不要通过rebase对任何已经提交到公共仓库中的commit进行修改，因为rebase会修改历史记录
https://git-scm.com/book/zh/v...


与恶龙缠斗过久,自身亦成为恶龙；凝视深渊过久,深渊将回以凝视…
OGeek|极客中国-欢迎来到极客的世界，一个免费开放的程序员编程交流平台！开放，进步，分享！让技术改变生活，让极客改变未来！ Welcome to OGeek Q&A Community for programmer and developer-Open, Learning and Share
Click Here to Ask a Question

Just Browsing Browsing

1.4m articles

1.4m replys

5 comments

57.0k users

Most popular tags

Snow Theme by Q2A Market
Powered by Question2Answer
...