For instance, back integration from a 'correction' branch to the 'development' branch always brings up a conflict, even though the development branch version was never modified.

比如说，从‘更正’分支到‘开发’分支的反向整合总会带来冲突，即使开发分支版本从来没有进行过修改。

youdao

For instance, back integration from a 'correction' branch to the 'development' branch always brings up a conflict, even though the development branch version was never modified.

比如说，从‘更正’分支到‘开发’分支的反向整合总会带来冲突，即使开发分支版本从来没有进行过修改。

youdao