Create a new Branch from Trunk Branch

1. Ensure that you are in Trunk Branch.

2. Download the latest changes in the Trunk Branch (Fetch and Pull) .

3. Click secondary on Trunk Branch and choose the option "New Branch".

4. Type the branch name with the following format "feature/name_of_the_feature".

5. Please ensure that you are in the new Feature Branch recently created.

6. Finally, upload the new Feature Branch to the server pressing Push.

Download changes of your target Branch

1. 1. Ensure that you are in your target Branch.

   2. Fetch the repository.

   3. If your target Branch has changes in the server, please press Pull button for download the latest changes. 

Get the changes of Trunk Branch

1. 1. Ensure that you are in your Feature Branch.

   2. Fetch the repository.

   3. If the Trunk Branch has changes continue with the process, else the process ends here.

   4. Download changes of Trunk Branch: Click secondary in Trunk Branch and choose the option "Fast Forward to origin/dev".

   5. Merge Changes in Feature Branch: click secondary in Trunk Branch and choose the option "Merge into feature_branch_name".

   6. Commit the Merge Changes in Feature Branch: if you don't have conflicts once the merge is completed, you can commit the changes in the feature branch.

   7. If the program displays a conflict popup window, please ask for support from the engineering side in order to resolve the conflicts.

   8. Finally, Push the changes of the Feature Branch

Generate a new commit 

1. 1. Ensure that you are in your Feature Branch.

   2. Fetch the repository and download changes if you branch contain new changes.

   3. Choose and stage all the files that you want to include into the commit.

   4. Type the commit subjet and description (Please the commit must describe your changes in the project).

   5. Click on Commit button.

   6. Finally, Push the changes of the Feature Branch.

Create a Pull Request

1. 1. Ensure that you are in your Feature Branch.

   2. Fetch the repository and update your branch if it is not updated.

   3. Create the Pull Request: Click secondary in "Feature Branch" and choose the option "Create Pull Request on...".

   4. Sign in in your account in your web internet explorer.

   5. Make sure about the following configurations

      1. From: Feature branch.

      2. To: dev/trunk branch.

      3. Reviewer: Lead Engineer user account.

      4. Asignee: Your user account.

   6. Click on Create Pull Request button.

   7. Finally, share the link of the pull request to your lead in slack.