Skip to main content
We publish frequent updates to our documentation, and translation of this page may still be in progress. For the most current information, please visit the English documentation.

解决合并冲突

如果您的更改与基本分支存在合并冲突,必须解决该冲突后才可合并拉取请求的更改。