Category Archives: Version control

Git: branching and merging

Posted on March 30, 2014 by Robert Piasecki

Branch is a core concept in Git and many other version control systems. Generally speaking, a branch is a line of development which is parallel and independent of all other lines but which still shares the same history with all … Continue reading →

Posted in Git, Version control | Tagged , , | Leave a comment

Git: how to use tags

Posted on March 9, 2014 by Robert Piasecki

Tagging is a very popular and common concept in version control systems. Tags are generally used to mark special milestones in a history of your repository like releasing a new version of your product. The common practice is to create … Continue reading →

Posted in cryptography, Git, Version control | Tagged , | 2 Comments

Git: how to resolve merge conflicts

Posted on March 3, 2014 by Robert Piasecki

When working in several people on the same part of code, you will sooner or later end up having merge conflicts. At first merge conflict may seem overwhelming but once you resolve few of them, they will cease to be … Continue reading →

Posted in Git, Version control | Tagged , | 8 Comments

Git: how to ignore files

Posted on February 21, 2014 by Robert Piasecki

When working with Git you will quickly come across several files which are present in the working copy for various reasons but which should not be tracked by Git. The typical examples are logs, compiled binaries or IDE configuration files. … Continue reading →

Posted in Git, Version control | Tagged , , | 1 Comment

Git: how to use stash

Posted on February 20, 2014 by Robert Piasecki

Sometimes I have a situation that I am working on some feature on my own branch and suddenly someone comes to me and says that something really important has to be fixed or improved on the main branch. Usually it … Continue reading →

Posted in Git, Version control | Tagged , , , | 10 Comments