Endjin - Home

Visual Studio

The Problem If you use Git (and GitFlow) with Visual Studio (which seems like it is going to become a much more popular combination), I’m sure you are well aware of the pain that is the “merge conflict” you often encounter when trying to merge (or rebase) a branch. There are three file types that […]


This post will go through how to write unit tests for your AngularJS app using Jasmine, how to run those tests in Visual Studio with ReSharper and the PhantomJS headless browser, and how to add a build step to your TeamCity CI pipeline to run the tests. The source code for the demo app is available […]


Following on from the previous post in this series which dealt with branching and pushing your changes, this post looks at how you can deal with merge conflicts. I’ll describe when conflicts occur and how they can be dealt with using Visual Studio, and third party Git client SmartGit. The next post in the series […]


This is part three of a set of blogs I’m writing as I learn about Git. In part one, I talked about Git’s distributed architecture, its approach to version management, and its support for frequent branching and merging. In part two, I looked at some of the tools we use to work with Git at […]


This is part two of a series of blogs which I’m writing as I learn about Git, an open source distributed version control system, and find out how it can be used for .NET development. In part one I talked about Git’s distributed architecture, its approach to version management, and its support for frequent branching […]


Apprenticeship Day 3

by Alice Waddicor

On day 3, I got to put the previous days’ learning into practice, as I tried implementing Atom functionality in Vellum, Endjin’s Azure-based Content Management System. This happened under the watchful eye of Matthew, who guided me through the process remotely through a combination of Skype and TeamViewer. This worked remarkably well – via TeamViewer […]


Xamarin lets you develop iOS applications using Visual Studio. This is obviously great for .NET Developers except that you currently have to go to Xcode (Apple’s Developer tool) if you want to create the UI using a designer tool. When you’ve got a Xamarin.iOS project, that means switching back and forth between the two IDEs. […]