One of the greatest advantage in using Git over a centralized Version Control System is branching system. It is quite common for developers to start branching whenever they need to add a new feature, work on that branch and finally merge back to mainline when the feature is finished. One of the most famous workflow […]

Continue reading about Monitor if your branch will generate merge conflicts with TFS Build

It could happens when you clone a Git Repository with submodules, issuing a git submodule update command, you are prompted with this error error. Cloning into ‘src/xxxx’… Warning: Permanently added the RSA host key for IP address xxx.xxx.xxx.xxx to the list of known hosts. Permission denied (publickey). fatal: Could not read from remote repository. If […]

Continue reading about Git submodule update error: Permission Denied Publickey

This is one annoying problem that happens sometimes to git users: the symptom is: git status command shows you some files as modified (you are sure that you had not modified that files), you revert all changes with a git checkout — . but the files stills are in modified state if you issue another […]

Continue reading about Git showing file as modified even if it is unchanged

In an old post I’ve already demonstrated how you can move a project from a standard TFS Version Control System to a Git repository hosted on TF Service (or wherever else). This is especially useful if you are working with TFS but you really need features of a Distributed Version Control System. The original post […]

Continue reading about Moving between different VCS to Team Foundation Server

This is the scenario: Nablasoft company uses TFS with standard TFVC (TFS Version Control System) and needs to assign some of the work to some external Company (lets call it Acme), as an example developing for Android or iOs. The simplest solution is giving Acme developers access to TFS server, but then Nablasoft should pay […]

Continue reading about Git as a bridge between Subversion and TFS