Exercise 2

• Create a file my_code.py on the master branch with any Python code inside;

• Make a new branch called feature;

• Modify one line of my_code.py both on the master and the feature branch;

  • Commit the changes

• Checkout master

• Merge with feature (resolve the conflict)