Common Concepts of Version Control
Conflict Resolution – Merge
Connect to Collaborate
Click on the services tab (the little cloud in the top right corner). Assign an organisation to your project. Then click on the “Collaborate” tab. Turn on “create together seamlessly”
The arrow on the “collab” button will be blue if you have newer files that need to be published or uploaded.
The arrow on the “collab” button will be orange when there are newer files on the server that you need to pull.