Instructor Notes

This is a placeholder file. Please add content here.

Introduction


Example Code


Feature Branch Workflow


Creating Feature Branch - Checkin

Who’s created their new feature branch?



Changing the File - Checkin

Who has added this to the file, and saved it?



Comming on the Branch - Checkin

Who’s edited the file and made the changes, and committed them - who’s done that twice?



Pushing the Feature Branch to GitHub - Checkin

Who’s committed that change and pushed the new branch with its commits to GitHub? If you have not done it - let’s push the feature branch to GitHub now!



Creating a Pull Request


Creating a Pull Request - Checkin

Who’s created the pull request?



Merging a Pull Request


Merging a Pull Request - Checkin

Who has merged the pull request?



Resolving Merge Conflicts