2026-08-13 02:22 浏览次数 27
合并提交
Then the conflicts (if any) will be in that merge commit rather than in your existing branch work.
然后沖突(如果有的话)将会在现有的分支合并提交,而不是工作。