我是git的新手。作为练习,我正在研究2个braches说program_1,program_2。
git branch program_1
ls temp
git branch program_2 # (create program_2 branch)
git checkout program_2
git merge program_1 program_2 # (as i need temp folder in program_2)
# Add some files in temp folder (say 1.c, 2.c)
git add temp/1.c temp/2.c
git commit
# <some explanation reg commit>
git review
我在这里遇到冲突。
You are about to submit multiple commits. This is expected if you are
submitting a commit that is dependent on one or more in-review
commits. Otherwise you should consider squashing your changes into one
commit before submitting.
The outstanding commits are:
9610151 (HEAD, program_2) program_2 submitting for review
8760f55 (program_1) Adding temp to program_1
Do you really want to submit the above commits?
Type 'yes' to confirm, other to cancel:
那这意味着什么?以及如何解决这个问题?我错过了什么?
有谁知道答案?
答案 0 :(得分:0)
git review
不是标准git的一部分,因此无论是谁开发它来回答这个问题都取决于它。
但是我会告诉你,尽管将两个或更多提交给gerrit进行审核并没有什么奇怪的,我会一直这样做。
将会发生的是,他们之间会有依赖关系,他们将按照这个顺序提交,无论他们按什么顺序进行审核。
这是处理彼此依赖的小型逻辑提交的最佳方法。