From 99422bc9d4231bc764a1398061b328a2986630a7 Mon Sep 17 00:00:00 2001 From: wusongqing Date: Mon, 14 Feb 2022 14:23:34 +0800 Subject: [PATCH] updated docs Signed-off-by: wusongqing --- en/contribute/faqs.md | 71 ------------------- en/device-dev/quick-start/Readme-EN.md | 6 +- .../quickstart-lite-introduction.md | 6 +- 3 files changed, 6 insertions(+), 77 deletions(-) delete mode 100755 en/contribute/faqs.md diff --git a/en/contribute/faqs.md b/en/contribute/faqs.md deleted file mode 100755 index ec7ef6d5de..0000000000 --- a/en/contribute/faqs.md +++ /dev/null @@ -1,71 +0,0 @@ -# FAQs - -## 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: - -1. Create an issue in any of the code repositories. -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 - -#### How to Add signoff Records in Commits? - -Execute the **git commit -s **or **git commit –signo** command to submit signoff records. - -#### How to Add a signoff record to the Previous Commit? - -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 - -After developers submit Pull Request, commenting "**start build**" in the PR will trigger the gated commit. In this sense, you should consider: - -1. Whether the DCO is signed. -2. Whether the commits contain Signed-off-by information. - -The possible causes for a verification failure include: - -1. The DCO is not signed. The following messages will be displayed: - - ``` - The following commit users do not signed the DCO: - - •345612 - - •213123 - ``` - - **Solution** - - Click [https://dco.openharmony.io/sign/Z2l0ZWUlMkZvcGVuX2hhcm1vbnk=) to sign the DCO or check the signing status. - - Enter **check dco** in the Pull Requests comment box and click **Comment**. The system will check the DCO signing status again. - -2. The commits do not contain Signed-off-by information. The following messages will be displayed: - - ``` - The following commits do not contain Sign-off-by information: - - •345612 - - •213123 - ``` - - **Solution** - - Add the Sign-off-by information by referring to **Sign-off-by Operations**. - - Enter **check dco** in the Pull Requests comment box and click **Comment**. The system will check the DCO signing status again. - -## Rollback - -Visit [https://gitee.com/help/articles/4195](https://gitee.com/help/articles/4195). - -## Resolving Merge Conflicts - -Visit [https://gitee.com/help/articles/4194](https://gitee.com/help/articles/4194). - diff --git a/en/device-dev/quick-start/Readme-EN.md b/en/device-dev/quick-start/Readme-EN.md index b330e84bc5..857374e4c2 100644 --- a/en/device-dev/quick-start/Readme-EN.md +++ b/en/device-dev/quick-start/Readme-EN.md @@ -3,9 +3,9 @@ - [Mini and Small Systems](quickstart-lite.md) - [Overview](quickstart-lite-overview.md) - [Introduction](quickstart-lite-introduction.md) - - [Hi3861 Development Board](oem_minitinier_des_3861.md) - - [Hi3516 Development Board](oem_minitinier_des_3516.md) - - [Hi3518 Development Board](oem_minitinier_des_3518.md) + - [Hi3861 Development Board](quickstart-lite-introduction-hi3861.md) + - [Hi3516 Development Board](quickstart-lite-introduction-hi3516.md) + - [Hi3518 Development Board](quickstart-lite-introduction-hi3518.md) - [Environment Setup](quickstart-lite-env-setup.md) - [Overview](quickstart-lite-env-setup-overview.md) - [Setting Up Windows Development Environment](quickstart-lite-env-setup-windows.md) diff --git a/en/device-dev/quick-start/quickstart-lite-introduction.md b/en/device-dev/quick-start/quickstart-lite-introduction.md index 4dfb38f660..2f95599480 100644 --- a/en/device-dev/quick-start/quickstart-lite-introduction.md +++ b/en/device-dev/quick-start/quickstart-lite-introduction.md @@ -1,9 +1,9 @@ # Introduction -- **[Hi3861 Development Board](oem_minitinier_des_3861.md)** +- **[Hi3861 Development Board](quickstart-lite-introduction-hi3861.md)** -- **[Hi3516 Development Board](oem_minitinier_des_3516.md)** +- **[Hi3516 Development Board](quickstart-lite-introduction-hi3516.md)** -- **[Hi3518 Development Board](oem_minitinier_des_3518.md)** +- **[Hi3518 Development Board](quickstart-lite-introduction-hi3518.md)** -- GitLab