没有共同祖先的分支
我似乎已经成功创建了一个并非源于初始提交的分支。
从存储库中提取更改时似乎会发生这种情况。我已经设法让我的工作分支拥有所有必要的提交,但我的分支历史很混乱。
我可以纠正吗?
I seem to have managed to create a branch that does not stem from the initial commit.
It seemed to happen when pulling changes from the repo. I have managed to get a point where my working branch has all the necessary commits, but my branch history is confusing.
Can I correct it?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
Git 不需要单个根提交。事实上, git.git 本身有几个根提交(它至少包含 git 的,gitk 和 gitweb 的历史记录)
因为您已经合并成功后,无需“修复”您的历史记录,Git 将在将来的合并过程中做正确的事情™。
Git does not require a single root commit. In fact, git.git itself has several root commits (it contains at least root commits for git's, gitk's and gitweb's history)
Since you have already merged successfully, there is no need to "fix" your history, Git will do the right thing™ during future merges.