To second Fabian, this process can be made easier by making use of Atelier projects.

You can think of an Atelier project as a place to store a unit of work. An Atelier project will typically store all of the files directly related to a particular application, feature, etc. Each Atelier project is configured with a server connection and namespace where code can be compiled and run. You do not necessarily need to create a new project each time you launch Atelier or add something to source control.

We will not generally be working with different projects. We will usually be working with the same project and making modifications to them like adding a new routine to an existing MAC, adding a button to a Zen page, etc.

We have been testing our process using git with Studio, but now it looks like we are going to use Atelier.

We have a server repository (in Bitbucket) that currently contains XML copies of our MACs and CLSs files. We create a branch from there and pull it down locally to our own personal environment (local Cache instance).

When working with our current task (modifications, new functionalites, etc), we import the needed files into our Cache instance and make our changes. We made hooks to export to XML the files we are working with when we compile.

When done, we commit these changes locally and then push them back to the server (Bitbucket).

What changes now with Atelier besides the files being saved automatically in UDL format when compiling?