You can use the Compare editor to resolve conflicts.
您可以使用Compare编辑器来解决这些冲突。
It's best to resolve conflicts before you hit the sack.
最佳的方法是在睡前解决掉所有争端。
Rule: Resolve conflicts on the branch that is least stable.
规则：在最不稳定的分支上解决冲突。
Rule: Resolve conflicts on the branch that is least stable.
规则：在最不稳定的分支上解决冲突。
应用推荐