Category: Version control

The following branching concept is commonly used these days for software development. Source: https://nvie.com/posts/a-successful-git-branching-model/ (by Vincent Driessen)

Via Macros A way to realise different variants is to work with variant flags within the code itself. The big

After developing a feature or fix you want to merge that branch onto the parent branch. There are two main

Basics Most people I talked to are using origin and remote as an equivalent, but the aren’t. Origin is the

1. Create a feature/fix branch Don’t work straight on the parent branch if you have to implement a feature/fix, atleast

Reason: If you have updated a local branch and then trying to push it on remote you may got the

This is necessary when you develop on an child-feature-branch and the parent-feature-branch has been rebased. 0. Initial situation 1. Rebase

Cloning – Creating a local copy of a remote repository. – Gets used to build a project or get involved.

The first thing is to checkout the newest commit from the wanted branch. Then you need to get the commit-id