Flosum's Version Control Strategy

Flosum has the same version control strategy as Microsoft, which consists of a two-pronged approach:

• Microsoft built its own version control system to be very tightly aligned with its development platform. Microsoft's system allows developers to be very productive on the development stack.
• However, it also provides integration with open-source version control systems so that Microsoft can quickly onboard developers who already have prior experience with another version control system.

The most common open-source version control system is Git. Some users love its expansive functionality, while others prefer to stay removed from the minute details of merging and branching. For teams that do work in Git, here's how to resolve merge conflicts in Git when two branches change the same lines.

There are numerous clients and editors that incorporate Git functionality, and it can be difficult for a development team to find a solution with the exact set of features that they're looking for.

Flosum's version control system was built from the ground up to align directly with the Salesforce platform. For example, there are many components that are specific to Salesforce (such as lightning components, static resources, etc.) that don't translate well to most open-source version control systems. Because the version control system in Flosum is tightly integrated with the Salesforce platform, it understands all of the components in the Salesforce ecosystem.

In addition to using its own native version control system, Flosum can be integrated with open-source version control systems such as Git (including Bitbucket, Github, etc.) and SVN, as well as with proprietary version control systems such as TFS, VSTS, and others. This allows developers to use their existing knowledge of other version control systems and significantly reduces ramp-up time.

Our guide to Salesforce version control gives an overview of version control on the platform, and our post on how Flosum simplifies Git integration covers Flosum's integration with Git.