From 8bbfd9cf0e5c59fac30e01a5c99d94bfd9a5624a Mon Sep 17 00:00:00 2001
From: Arul Kumaran <arulkumaran.devarajan@huawei.com>
Date: Fri, 12 Mar 2021 12:32:53 +0530
Subject: [PATCH] Intial commit

---
 quick-start/build-open-harmony.rst | 48 ++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/quick-start/build-open-harmony.rst b/quick-start/build-open-harmony.rst
index ae4b0ec..020b9af 100644
--- a/quick-start/build-open-harmony.rst
+++ b/quick-start/build-open-harmony.rst
@@ -50,35 +50,65 @@ Downloading Source Code
 Once git-repo has been installed, you can clone the necessary repositories.
 
 **For OHOS User**
+
 If you are a user and wants to build your product on top of OHOS, then clone the ‘stable’ branch by executing the following commands:
 
+<<<<<<< HEAD
  .. code-block:: console
  
       $ mkdir ohos; cd ohos
       $ repo init -u https://git.ostc-eu.org/OSTC/manifest.git -b stable
       $ repo sync --no-clone-bundle
+=======
+.. code-block:: console
+
+   $ mkdir ohos; cd ohos
+   $ repo init -u https://git.ostc-eu.org/OSTC/manifest.git -b stable
+   $ repo sync
+>>>>>>> afb820a (Update build-open-harmony.rst for Issues #19)
 
 **For OHOS Developer**
+
 If you are a developer and wants to contribute to OHOS, then clone the ‘develop’ branch by executing the following commands:
 
+<<<<<<< HEAD
  .. code-block:: console
  
       $ mkdir ohos; cd ohos
       $ repo init -u https://git.ostc-eu.org/OSTC/manifest.git -b develop -m develop.xml
       $ repo sync
+=======
+.. code-block:: console
+
+   $ mkdir ohos; cd ohos
+   $ repo init -u https://git.ostc-eu.org/OSTC/manifest.git -b develop
+   $ repo sync
+>>>>>>> afb820a (Update build-open-harmony.rst for Issues #19)
 
 The preceding commands creates the following directory structure (layers): 
 
- .. code-block:: console
+.. code-block:: console
   
-     ./ohos/
-    └── sources
-        ├── meta-freertos
-        ├── meta-ohos
-        ├── meta-openembedded
-        ├── meta-zephyr
-        ├── <various yocto layers>
-        └── poky
+   ./ohos/
+   └─ sources
+      ├── meta-freertos
+      ├── meta-ohos
+      ├── meta-openembedded
+      ├── meta-zephyr
+      ├── <various yocto layers>
+      └── poky
+
+To verify the created directory structure (layers), run the following command:
+
+.. code-block:: console
+
+   $ cd sources && ls -l
+
+Navigate to *ohos* directory by running the following command:
+
+.. code-block:: console
+
+   $ cd .. 
 
 .. list-table:: meta-ohos
   :widths: auto
-- 
GitLab