This blog post introduces a few hints about what you can expect when you diff changesets (commits) in your version control. Something similar to what we wrote to explain the difference between 2-way and 3-way merge months ago.

The diff function

Diff (9) actually means “diff with previous” or Diff(8, 9). We’ll assume the Diff function to be Diff(src, dst).

In January of this year Microsoft made public their most innovative and disruptive product in quite some time called HoloLens, an augmented reality headset that combines breakthrough hardware, input and machine learning so that you can bring mixed reality experiences to life using the real world as your canvas. These are not just transparent screens placed in the center of a room with an image projected on them but truly immersive holograms that enable you to interact with the real world. This is a truly innovative product with a rich set of APIs that enable you to develop Windows Holographic applications that will blur the line between the real world and the virtual world.

As impressive as this may sound, Microsoft has been very quiet about this technology; only allowing a few videos and bits of information to be released. But at the most recent Microsoft Developer Conference//Build 2015, they allowed a select group of people, around 180 people in total including me, to try out this new technology.

On November 2014 Microsoft announced their new strategy for the .NET future. The most important part of the announcement was the release of .NET Core 5 as a componentized framework that will be shipped via NuGet. The .NET Core CLR is open source, and supports Windows, Linux and Mac OS X. It's publicly available in GitHub.

In any software development process planning and making knowledge available for the entire team is a valuable resource. With the right information it is possible to reduce confusion among team members. The team needs to know what each member is working on, how the overall project is going, what difficulties are raising and how to overcome them.

Tools like Axosoft helps you and your team to organize, plan and be ready to release your software in an easy way.

We’re happy to introduce Plastic Gluon today, a new Plastic designed with artists in mind. Find all the details here:

Gluon doesn’t need extra licensing so if you have Plastic you can start using it today.

If you are a developer of Android Apps you are probably very familiar with the many Integrated Developer Environment (IDE) tools that are currently available. Several of the more prominent of these tools include: Android Studio, Eclipse, Netbeans and IntelliJ IDEA. Any one of these tools would be an excellent choice for app development but the IntelliJ stands out because it is less complex and is more user-friendly which appeals to a broader cross section of developers like you. In this article we will take a look at how you can use the IntelliJ IDEA Java IDE tool to create awesome Android apps.

Atlassian's Bamboo is one of the most popular Continuous Integration servers, used by big enterprises and small startups alike. Of course, we released our own plugin to integrate Plastic SCM as a valid repository source in Bamboo quite a long time; however, you might have noticed that it didn't support an interesting Bamboo feature: automatic branch merging.

Well, not anymore. Since our release, we've extended our Bamboo plugin and adapted our client core to provide this option! But don't leave just yet. We'll show you a quick example of how to allow Bamboo to automatically merge your Plastic SCM branches, using our lightning-fast Plastic SCM Merge Machine behind the scenes.