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.

Git is straightforward to begin with, but when you're ready, you can progress onto more advanced topics like branching, merging, conflict resolution, etc. Let's start by changing to a directory and ...

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 ...

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 ...

Microsoft has announced the release of the third update for its development environments Visual Studio and Team Foundation Server 2013. While previous updates have focused on enhancing the capacity of ...

Git isn't hard to learn, and when you combine Git with GitLab, you've made it a whole lot easier to share code and manage a common Git commit history with the rest of your team. This tutorial shows ...