Merge Projects

Description

In this scenario we will combine the WKND and WKND-Events project. This scenario comprises of 3 parts:

Serial	Scenario	Complexity
1	Clone and Format WKND Project	Medium
2	Clone and Format WKND-Events Project	Low
3	Merge WKND and WKND-Events Project	High

Pre-requisites

1. github.com account or a GIT repository on https://git.corp.adobe.com
2. git command line or GitHub Desktop
3. Cloud Ready Adobe Experience Manager
4. Apache Maven (3.3.9 or newer)
5. Adobe Public Maven Repository in maven settings

Scenario 2

Step 1. Clone the WKND Project

1. Clone WKND Sites Project

   git clone --branch develop https://github.com/adobe/aem-guides-wknd.git

2. Set up an empty Git Repository

   This GIT repository will be referred to as Origin

3. Open the Command Prompt or the Terminal Window.

4. Navigate using the command line to the local directory that contains cloned WKND Project

5. Execute the following commands, to delete the .git folder

   • Windows:

     rmdir .git /S

   • Mac

     rm -R .git

6. Initialize the local repository and point it to the remote Origin GitHub

   git init

   git add .

   git commit -m 1_commit

   git remote add origin <http URL for the origin git>
   
   e.g. git remote add origin https://github.com/varunmitra/WKND.git

   git push -f origin master

---

Step 2. Format the WKND Project

1. Navigate using command line to the local directory that contains cloned WKND Project

2. Create a new directory

   mkdir wknd

3. Move projects and files inside the newly created directory

   git mv pom.xml all core it.launcher it.tests repository-structure ui.content.sample ui.frontend ui.content ui.apps wknd

4. Resulting folder structure will look like:

   

5. Create a new pom.xml file.

6. Update the pom.xml file with the following code

7. Add pom.xml to the current project

   git add pom.xml

8. Update the pom.xml file for the dispatcher module with the following code

9. Test project sanity by running mvn verify

10. Commit the GIT Changes

    git commit -m "moving wknd"

11. Push the latest changes to Remote Origin GitHub

    git push -f origin master

12. Resulting GitHub will look something like:

    

Step 3. Clone the WKND Events Project

1. Clone WKND-Events Sites Project

   git clone --branch react/chapter-3 https://github.com/Adobe-Marketing-Cloud/aem-guides-wknd-events.git

2. Set up an empty Git Repository

   This GIT repository will be referred to as Origin

3. Open Command Prompt or Terminal Window.

4. Navigate using command line to the local directory that contains cloned WKND-Events Project

5. Execute the following commands, to delete the .git folder

   • Windows:

     rmdir .git /S

   • Mac

     rm -R .git

6. Initialize the local repository and point it to remote Origin GitHub

   git init

   git add .

   git commit

   git remote add origin <http URL for the origin git>
   
   e.g. git remote add origin https://github.com/varunmitra/WKND-Events.git

   git push -u origin master

---

Step 4. Format the WKND-Events Project

1. Navigate using command line to the local directory that contains cloned WKND Project

2. Create a new directory

   mkdir wknd-events

3. Move projects and files inside the newly created directory

   git mv pom.xml core ui.content react-app ui.apps wknd-events

4. Resulting folder structure will look like:

   

5. Create a new pom.xml file.

6. Update the pom.xml file with the following code

7. Add pom.xml to the current project

   git add pom.xml

8. Test project sanity by running mvn verify

9. Commit the GIT Changes

   git commit -m "moving wknd-events"

10. Push the latest changes to Remote Origin GitHub

    git push -u origin master

11. Resulting GitHub will look something like:

    

---

Step 5. Merge the WKND and WKND Events project

Description

In ths section we will merge the WKND and wKND-Events Project. In order to achieve this we will follow the given steps:

1. Add WKND-Events GitHub as a remote repository for WKND. This will allow us to fetch the content of WKND-Events Project and add it as a branch of WKND.
2. Fetch WKND-Events Project.
3. Switch the branch pointer to WKND-Events/Master branch.
4. Verify the project contents.
5. Switch the branch pointer back to the WKND Master branch.
6. Perform a branch merge using --allow-unrelated-histories flag.
7. Fix the Merge errors. Most importantly, modify the pom.xml to point to both wknd and wknd-events projects.
8. Commit the changes.
9. Verify the project using mvn verify or mvn clean install
10. Push the consolidated project to Cloud Manager GitHub.

Exact Steps and Git Commands are as below:

1. Navigate using command line to the WKND project

2. Run the following commands:

   git checkout master

   git remote add WKND-Events <path to cloned WKND-Events Git repository>
   e.g. git remote add WKND-Events https://github.com/varunmitra/WKND_Events.git

   git fetch WKND-Events

   git checkout -b WKND-Events WKND-Events/master

   Verify the directory strcture:
   For Mac : ls
   For Windows: dir

   git checkout master

   git merge WKND-Events --allow-unrelated-histories

   Fix the Merge errors. pom.xml should look something like https://gist.github.com/varunmitra/783c4944cc5c2c5294790ca85186bc00

   Verify the directory strcture:
   For Mac : ls
   For Windows: dir

   git commit -am "updating parent pom"

   mvn verify

3. Add cloud manager GitHub

   git remote add cm_repo <path to cloud manager git repository>
   e.g. git remote add origin https://github.com/varunmitra/wknd_wknd_events.git

4. Push to Cloud Manager GitHub

   git push -u cm_repo master:merge