我是 git 新手。作为实践,我正在研究 2 个分支,比如 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:
那么这意味着什么?以及如何解决这个问题?我错过了什么?
谁能知道答案?