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....
SSH is a protocol used to transfer data between to entities (client and server or services) using encryption. It's basically a telnet where data is transferred over a secure channel. This means that all data transmitted in both directions is secure from eavesdropping. In software development it is used to securely connect to a...
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....
This article outlines how to install my preferred development environment using iTerm2 and zsh (Z shell) together with some plugins on MacOSX. It doesn’t go into much detail and describes a hands-on installation of these tools....