Branching tutorial Get your own copy of the repository In GitHub, fork nrsiward/branching_tut to your account Clone branching_tut from your account to your local disk Implementing a new feature Create branch feature1 (to implement a new feature) Change line 2 in file1.txt Making an urgent bug fix at an inconvenient time Stash Change back to branch master (to make a bug fix before the feature is done) Edit line 3 and line 4 in file1.txt Stage and commit Finishing the new feature Change to branch feature1 Pop the stash Change line 4 in file1.txt (to finish implementing the feature) Stage & commit Merge the new feature Change to branch master Merge branch feature1 Resolve conflicts Share with others Push Clean up the uneeded branch Delete local branch feature1 Push the branch deletion Make a release Tag repo Push commit and tag