Rule: Merge from trunk to your work branch every day.

规则：每天都从主干向你的工作分支中合并代码。

youdao

Rule: Resolve conflicts on the branch that is least stable.

规则：在最不稳定的分支上解决冲突。

youdao

Rule: Resolve conflicts on the branch that is least stable.

规则：在最不稳定的分支上解决冲突。

youdao