lindsayvallen
commented
6 years ago To make a feature branch in Sourcetree, make sure you have checked out the commit you want your branch to start from. If, for example, you want to create a feature branch to work on something I just deleted in my recent commit, then you would check out the commit just before that by double-clicking on it in the history. To make the new branch, click the button "Branch" and use the name "feature/your-desired-name-here", e.g. "feature/climber-2018", and then click "Create Branch". John and I can cover later how to merge master into your branch, and when you're ready, how to merge your branch into master.
I made a major commit to the master branch just now that removed much of the code. The goal was to create a master branch that is clean and functional to avoid some of the thrash of debugging unused parts of the code or other people's parts that aren't fully working yet. John and I would like us to keep the master branch largely working, so when you want to add a new feature or part of code that may risk breaking the rest you have two options: 1) If it's a minor change that you can test before committing it, you're welcome to commit it to the master branch, or 2) create a feature branch if you'll need to make several commits or take more than one session to implement the change, and when you're done, merge your feature branch back in.