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...
Git Branches – Working with Branches – Part II (Merge Conflicts)
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,...
GIT Tutorial – Working with Branches – Part I
For reasons of simplicity in this tutorial, we will assume that you are working as a single developer with a local repository (MASTER). Implementing a new Feature Option 1 When you just add one feature after the other, you can make the changes, add them to the Staging Area and commit the changes to...