diff --git a/en/contribute/faqs.md b/en/contribute/faqs.md index 8240113c2ddb7e87f7156e16c0fa916e9064a2df..d12e7680aa521062ece5d1a6ea41f6b95c918265 100755 --- a/en/contribute/faqs.md +++ b/en/contribute/faqs.md @@ -1,5 +1,15 @@ # FAQs +[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? 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 #### 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 After developers submit Pull Request, commenting "**start build**" in the PR will trigger the gated commit. In this sense, you should consider: diff --git a/en/readme.md b/en/readme.md index 4931059a15b9ae98cadd621128623ef81acd0fed..1dd86e1a5ddda7bfcf0140edc7ef2faa5bd3de6f 100644 --- a/en/readme.md +++ b/en/readme.md @@ -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 diff --git a/zh-cn/contribute/FAQ.md b/zh-cn/contribute/FAQ.md index ac1101526e87134bf6aa7383fd5b3eeb9b4d5c53..a6bf4efc848804b734901d919de63d96caf7227a 100755 --- a/zh-cn/contribute/FAQ.md +++ b/zh-cn/contribute/FAQ.md @@ -1,5 +1,16 @@ # FAQ +[多个代码仓存在编译依赖时如何同时发起构建](#section169732563435) + +[ `Sign-off-by`相关操作](#section-sign-off) + +[DCO校验异常处理](#section-dco) + +[回退提交](#section479422315253) + +[处理冲突](#section94417232274) + + ## 多个代码仓存在编译依赖时如何同时发起构建 OS\(操作系统\)开发时,经常会遇到多个代码仓的修改具有编译依赖关系,需要同时构建、同时合入。为此码云平台将Issue作为具有编译依赖的多个代码仓提交PR的关联标识。具体操作如下: @@ -10,7 +21,7 @@ OS\(操作系统\)开发时,经常会遇到多个代码仓的修改具有编 3. 触发构建\(详见触发构建的操作帮助\)后,构建中心会识别关联了同一Issue的PR,同时下载构建,并在代码审核通过后,同时进行合并入代码库。 -## `Sign-off-by`相关操作 +## `Sign-off-by`相关操作 ### 如何在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校验异常处理 开发者提交Pull Request后,评论`start build`会触发门禁校验: diff --git a/zh-cn/readme.md b/zh-cn/readme.md index 7d6107694eaf72ffc0847a45db9737b8495ed808..3ea598fbddc507d132fbd078b09f81ce520171d6 100644 --- a/zh-cn/readme.md +++ b/zh-cn/readme.md @@ -69,7 +69,7 @@ ## **版本更新** -参考[Release Notes](release-notes/OpenHarmony-Release-Notes.md)。 +参考[Release Notes](release-notes/Readme.md)。 ## **第三方开源软件及许可说明**