This summary assumes that you have either read the Tutorial or already know some of the basics of Git, but need a quick side reference. Please refer to the full tutorial (and accompanying problem-solving tutorial) for an in-depth guide to each step of the process.
feature branch, make changes to your files and save. Make sure you are working ‘one stage/issue per
Commit changes to your
feature branch. Summarise your changes succinctly in the textbox. Make sure “Push changes immediately to…” is left unchecked.
Remember! You will be looking back at your work through each
commit, so make sure each
commit is coherent.
Switch to the
development branch by right-clicking on it and selecting
Refresh remote status, and (if there are any
pull down the latest
development branch from
Merge your changes from
feature branch into
development branch by right-clicking on the
feature branch and selecting
Merge. If there are no conflicts, you’ll be able to do Step 8.
If there are conflicts, you can find them by searching for the
<<<<<<< HEAD text inside the file(s). Fix them, then save the file. Then, commit the resolved file(s) to the
development branch as per Step 3.
After having merged it into
development, right-click on the
branch you wish to delete and select