From 54afa53f4a59a8efdcdd73b33f06c84f7f058828 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Mon, 29 Mar 2021 21:17:33 +0100
Subject: [PATCH] readme: Remove FAQs section
This will need to be replaced with actual FAQs in the context of the
project. The generic git related entries right now are of little value.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
readme/FAQs.rst | 29 -----------------------------
readme/README.rst | 2 --
2 files changed, 31 deletions(-)
delete mode 100644 readme/FAQs.rst
diff --git a/readme/FAQs.rst b/readme/FAQs.rst
deleted file mode 100644
index a54de58..0000000
--- a/readme/FAQs.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-.. SPDX-FileCopyrightText: Huawei Inc.
-..
-.. SPDX-License-Identifier: CC-BY-4.0
-
-.. include:: ../definitions.rst
-
-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, Gitlab uses issues as the association identifiers for code repositories with dependency dependencies to commit the PRs. Follow the operations below:
-
-#. Create an issue in any of the code repositories.
-
-#. Associate PRs that need to be built and merged at the same time with the issue. For details, visit https://docs.gitlab.com/ee/topics/gitlab_flow.html#mergepull-requests-with-gitlab-flow.
-
-#. 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.
-
-Rollback
-********
-
-Visit https://docs.gitlab.com/ee/university/training/topics/rollback_commits.html#undo-commits
-
-Resolving Merge Conflicts
-*************************
-
-Visit https://docs.gitlab.com/ee/topics/git/git_rebase.html#merge-conflicts
\ No newline at end of file
diff --git a/readme/README.rst b/readme/README.rst
index 6a4dee0..078ef05 100644
--- a/readme/README.rst
+++ b/readme/README.rst
@@ -14,5 +14,3 @@ Contributing Documents
Contribution-Process
Contributing-to-the-Documentation
reStructuredText-Basics
- FAQs
-
--
GitLab