Practising branches with git (optional)

[HChughtai]

Exercise A - Creating a feature branch for my_pipeline

Using your my_pipeline repository, you'll create a new branch called complex-steps, do some work on it, and then merge it back into your main branch

1. On your terminal, within your my_pipeline repository create and switch to a new branch called complex-steps
2. Modify readme.md with some more workflow steps
3. Check the status, then add and commit as usual
4. Push your branch to your remote on Github (e.g. git push -u origin complex-steps)
5. Switch back to your main branch - look at the contents of readme.md
6. Still on your main branch - modify the steps in readme.md, add and commit.
7. Run git log --all --decorate --oneline --graph and have a look at the output
8. Merge your complex-steps branch into your main branch
9. Fix any conflicts, add, and commit
10. Run git log --all --decorate --oneline --graph again and observe what the output is.

Exercise B - A Complex Branch Structure

In small groups or individually, using Github's visualisation tool as shown in class, do the steps needed to replicate the repository structure shown below.

❗ hash numbers for the commit are going to be different and the final shape of the graph may look slightly different.