提交父级不使用先前的提交ID,而是将其设置为当前提交父级。这会在推动合并时产生冲突。
以前的州:
1c4d3d7 **feature/epgw** origin/feature/epgw
commit 1c4d3d7
Parent: 5c2aecd
Branches: feature/epgw, origin/feature/epgw
新州:
Made changes to checked out branch feature/epgw it created the commit id deb9302.
deb9302 **feature/epgw**
1c4d3d7 origin/feature/epgw
commit deb9302
Parent: 5c2aecd
Branches: feature/epgw
commit 1c4d3d7
Parent: 5c2aecd
Branches: origin/feature/epgw
为什么此提交的父级是5c2aecd
而不是之前的提交1c4d3d7
?