GitRuler Section E

This repository is section C of the GitRuler exercises. If you do not already have a your own repository for these exercises fork this repository.

In this exercise we will learn about branching and merging.

Branching and working within a branch

1. Run GitRuler to initialise the exercise.
2. Create a new branch in this repository called new-location-1 from master.
3. In the new-location-1 branch add "Sunny Rosario" to a new line in files/employees.txt. Commit that change with the message "Add employee Sunny"
4. Switch back to the master branch add a new file called files/products.txt containing "Bananas". Commit this file with the message "Add products file".
5. Merge all changes from the master branch into the new-location-1 branch.
6. Merge all changes from the new-location-1 branch into the master branch.

Submitting the results

Once the exercise is complete, push this repository to the remote. If there are multiple branches for an exercise, make sure that you push them all.

To ensure that you have you correctly pushed everything that you need to, you could clone the remote repository into a separate folder and re-run gitruler.

Resources

1. Creating branches: https://githowto.com/creating_a_branch.
2. Switching between branches: https://githowto.com/navigating_branches.
3. Merging changes from one branch to another: https://githowto.com/merging.