Current limitations when collaborating on the same component between multiple developers

At the moment only 1 branch is active on an instance, switching the branches is very complex and time-consuming and you may lose some work if you are not careful. What most customers do at the moment is use the same branch for the individual application and all developers work on the same branch or have multiple developer instances to manage different branches and then merge them.

What is a developer sandbox and how does it help the developers?
A dev sandbox is an abstraction on an instance that feels like an entirely different instance, despite sharing the same components under the hood. Dev sandbox allows multiple developers to collaborate on the same component on the same instance but in their own specific branches.

How do I merge flows?

Flows have always been a pain when collaborating with multiple developers because flows are captured as XMLs and you cannot merge flows EVER when they act as XMLs but do work with other areas of the platform as that is code (e.g. script includes, business rules, etc), with the CreatorCon keynote this year it was released that flows will not act as code! This means that flows in the backend will be code and can be easily merged when merging branches.