提交 b3621639 编写于 作者: O openharmony_ci 提交者: Gitee

!535 update links

Merge pull request !535 from NEEN/master
# FAQs<a name="EN-US_TOPIC_0000001053622377"></a>
[How Do I Create PRs at the Same Time If Multiple Code Repositories Have Compilation Dependencies?](#section169732563435)
[Sign-off-by Operations](#section-sign-off)
[Handling Exceptions of DCO Verification](#section-dco)
[Rollback](#section479422315253)
[Resolving Merge Conflicts](#section94417232274)
## How Do I Create PRs at the Same Time If Multiple Code Repositories Have Compilation Dependencies?<a name="section169732563435"></a>
During the development of the operating system \(OS\), it is common that multiple code repositories have compilation dependencies. Therefore, the PRs need to be created and merged at the same time. For this reason, Gitee uses issues as the association identifiers for code repositories with dependency dependencies to commit the PRs. Follow the operations below:
......@@ -8,7 +18,7 @@ During the development of the operating system \(OS\), it is common that multipl
2. Associate PRs need to be built and merged at the same time with the issue. For details, visit [https://gitee.com/help/articles/4142](https://gitee.com/help/articles/4142).
3. After the build is triggered, the build center identifies the PRs associated with the same issue, downloads the build, and merges the PRs into the code library after the code is approved.
## Sign-off-by Operations
## Sign-off-by Operations<a name="section-sign-off"></a>
#### How to Add signoff Records in Commits?
......@@ -20,7 +30,7 @@ Execute the **git commit --amend --signoff** command.
For more options about commit, see [https://](https://git-scm.com/docs/git-commit)[git-scm.com/docs/git-commit](https://git-scm.com/docs/git-commit).
### Handling Exceptions of DCO Verification
## Handling Exceptions of DCO Verification<a name="section-dco"></a>
After developers submit Pull Request, commenting "**start build**" in the PR will trigger the gated commit. In this sense, you should consider:
......
......@@ -66,7 +66,7 @@ This project stores OpenHarmony documentation, including the quick start guide,
## Version Change History
For details, see [Release Notes](release-notes/OpenHarmony-Release-Notes.md).
For details, see [Release Notes](release-notes/Readme.md).
## Third-Party Open-Source Software and License Notice
......
# FAQ<a name="ZH-CN_TOPIC_0000001053622377"></a>
[多个代码仓存在编译依赖时如何同时发起构建](#section169732563435)
[ `Sign-off-by`相关操作](#section-sign-off)
[DCO校验异常处理](#section-dco)
[回退提交](#section479422315253)
[处理冲突](#section94417232274)
## 多个代码仓存在编译依赖时如何同时发起构建<a name="section169732563435"></a>
OS\(操作系统\)开发时,经常会遇到多个代码仓的修改具有编译依赖关系,需要同时构建、同时合入。为此码云平台将Issue作为具有编译依赖的多个代码仓提交PR的关联标识。具体操作如下:
......@@ -10,7 +21,7 @@ OS\(操作系统\)开发时,经常会遇到多个代码仓的修改具有编
3. 触发构建\(详见触发构建的操作帮助\)后,构建中心会识别关联了同一Issue的PR,同时下载构建,并在代码审核通过后,同时进行合并入代码库。
## `Sign-off-by`相关操作
## `Sign-off-by`相关操作<a name="section-sign-off"></a>
### 如何在Commit中添加signoff记录
......@@ -22,7 +33,7 @@ OS\(操作系统\)开发时,经常会遇到多个代码仓的修改具有编
关于commit更多选项,请参考:[https://](https://git-scm.com/docs/git-commit)[git-scm.com/docs/git-commit](https://git-scm.com/docs/git-commit)
## DCO校验异常处理
## DCO校验异常处理<a name="section-dco"></a>
开发者提交Pull Request后,评论`start build`会触发门禁校验:
......
......@@ -69,7 +69,7 @@
## **版本更新**<a name="section945819377382"></a>
参考[Release Notes](release-notes/OpenHarmony-Release-Notes.md)
参考[Release Notes](release-notes/Readme.md)
## **第三方开源软件及许可说明**<a name="section840310516385"></a>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册