Welcome to ShenZhenJia Knowledge Sharing Community for programmer and developer-Open, Learning and Share
menu search
person
editAsk a Question
Welcome To Ask or Share your Answers For Others

Categories

关于代码合并问题 gitlab

in Technique[技术] by (71.8m points)

A和B两个分支，B分支是从远程分支上新建的一个本地分支的，每次有同事提交代码都会提交到B分支上，然后我这边再从B分支更新下来，最后合并到A分支上。

当需要合并代码时，切换到A分支下，执行git merge B 发现今天同事提交的代码合并进来了，之前提交更新下来的代码并没有合并进来，也就是说B分支里面的代码并没有全部合并到A分支里面，我重新执行git merge B 已经提示Already up-to-date.说明已经是最新了，但代码还是没有完全合进来，这是什么原因呢


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

1 Answer

by (71.8m points)

你有可视化工具吗?smartgit,sourcetree,gitlab 的分支图也行,把你们的出问题的和前后一小段的分支图截图出来,标记清楚分支,敏感信息打码,贴到内容中,这样会比较清晰..


与恶龙缠斗过久,自身亦成为恶龙；凝视深渊过久,深渊将回以凝视…
thumb_up_alt 0 like thumb_down_alt 0 dislike
Welcome to ShenZhenJia Knowledge Sharing Community for programmer and developer-Open, Learning and Share

Just Browsing Browsing

548k questions

547k answers

4 comments

86.3k users

Most popular tags

Theme made by Momin Raza, Modified by Ostack
Powered by Question2Answer
...