In this post, we will show you how to resolve Merge Conflicts in Git. Git allows developers to create branches from the main codebase to make independent changes. These changes can then be merged into ...

Do you use source control tools to manage your software development process? Source control was the very first item on Joel Spolsky's Joel Test for the quality of a development team back in 2000.

Microsoft released a new version of Visual Studio Tools for Git yesterday, that adds some welcome functionality. The update is version 0.8.0.0 (so it's still in the preview stage). The two key ...

Community driven content discussing all aspects of software development from DevOps to design patterns. One of the coolest features of the git log command is the graphing feature. The git log graph ...