You have learned how to merge two branches and how to deal with merge-conflicts. When you develop new features it makes sense to develop them on a branch that is based on the latest version of your Master branch. If the feature branches are based on the non-current version of the Master branch than...
Branching sounds fine, but quite often so-called merge-conflicts occur, even in a single-user local-git-repository environment. You created a feature branch A to develop a new feature. To implement the new feature you have to add and change a lot of the CSS in styles.css Suddenly a bug appears on your website. To fix the bug,...