Everything was green and working automatically while merging a feature branch to our latest release branch. In fact, I was about to meet my colleagues in the coffee room for a break, but... Ouch! A big red conflict involving a lot of lines appeared. At first glance, I have no idea what happened to the conflicting file. Cancel the coffee break? Hold on, not yet, not today!

Let me show you the steps I followed to solve a non-trivial merge conflict with Plastic SCM and have the feature branch integrate and checked-in into the release branch. For this purpose, I used some 2nd-class-citizen features in Plastic that definitively I have to promote to 1st class after this experience.

BL793 comes with another great feature for OS X users: now you can filter branches in the Branch Explorer! It is an added capability on top of the “inclusion/exclusion rules”. It works as follows:

Release BL793 (short of 5.4.16.793 – BL means baseline) brought a great new feature: moving changesets to a different branch! This way we close the Top-1 User Voice request from our users.

Do you know when you are working on something, you checkin, and then you realized you made the checkout on the wrong branch? Like directly on “main” instead of your task branch? Painful, uh?

Well, now the pain is gone, watch how simple it is to solve the issue:

Available on OS X, Linux and Windows, and also from the command line using the refurbished “cm changeset” command.

Enjoy!

We are happy to announce that it is now possible to merge branches using a Plastic Cloud server (it applies both to Team + Cloud and Cloud Edition).

We initially disabled it because we wanted to encourage users to stick to the distributed model (push/pull), but you sent us so many requests asking to enable it that we decided to release it.

Merging in Plastic Cloud enables the simpler “centralized workflow” not only for artists using Gluon but also for coders. Now nothing stops you to start creating branches, checkin changes and finally get child branches integrated back to main.

Ever faced the following issue while dealing with long paths in Windows?

Good news! Microsoft has released the .NET 4.6.2 framework and it fixes the “path is too long” error.

Applications using the Win32 framework will also take advantage of this new feature but you will need to tweak a couple of settings to make it work, since Microsoft didn’t enable it by default.

This blogpost explains how to set up your machine to get the issue fixed.

The goal of this blog post is to explain how you can take advantage of the Jenkins pipeline projects with Plastic. As you probably know, Plastic SCM already includes a plugin for regular Jenkins projects. This way each of your commits/checkins will trigger a build in Jenkins. But the standard plugin does not yet support the Jenkins Pipelines (formerly called "workflows"). Jenkins supports Pipelines with Git, though, so we will use Plastic GitServer to take advantage of that.

Pipelines are Jenkins jobs enabled by the Pipeline plugin and built with simple text scripts that use a Pipeline DSL (domain-specific language) based on the Groovy programming language.

Pipelines leverage the power of multiple steps to execute both simple and complex tasks according to parameters that you establish. Once created, pipelines can build code and orchestrate the work required to drive applications from commit to delivery.

The concept of build pipelines has been around for a few years and it is now becoming more and more a standard practice.

Back in late August, I was working from home. Then someone asked me to send a VMWare image to the office. The virtual machine was +17 GB in size so using Slack was not an option. Since I wasn't at the office, using a USB drive was not an option either.

I had some spare time so I thought: "well, writing a small program using UDT's rendezvous mode should be straightforward" (this mode which basically lets you establish a true P2P connection)... By the way, I could have used something better like https://reep.io but... hey, I just wanted to do some coding :-)