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,...
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...
I will explain how to connect to set-up and connect to a remote repository (Bitbucket and GitHub) and how to work with these repositories. I don’t want to complicate things, hence this tutorial gives you the basic understanding of how to work with Git. Before you start, you need to generate a SSH key-pair....
Git is a distributed version control system. Distributed means, that each user has a local copy of a (remote) repository on his or her computer. I will dive right into Git using hands-on examples. In this part, I will only focus on local repositories to explain the basics. There are many ways to install git....