using-version-control-in-studio-pro

[andrescocaacl]

Please use the form below, leaving the prefilled data to help us. Thank you.

Page link: using-version-control-in-studio-pro

Document link: _index.md

My Issue/Suggestion

The way I understand this paragraph I see some contradictions and ambiguities. The paragraph:

For example, you are developing a feature together with another developer on the same branch. You both have the same starting point (3). When your colleague commits a change, you can choose to retrieve these changes and integrate them. To enable this, developers first need to commit existing changes locally (6), so that the changes can be automatically merged when they are retrieved by other developers. After this, you commit the merged result, and optionally push the merged result (7) to be used by your colleague. Because changes are already explicitly committed, you can always see what you changed and you cannot accidentally override your local changes when you are resolving conflicts.

1.“you are developing a feature together with another developer on the same branch”.
Doesn’t the image show that you are working on a branch but your colleague is still working in the Main branch.

2.“developers first need to commit existing changes locally (6), so that the changes can be automatically merged when they are retrieved by other developers. “
So this says if I commit existing changes locally, then other developers can retrieve it. But then:

3.“After this, you commit the merged result, and optionally push the merged result (7) to be used by your colleague”
If I don’t push, my changes are not available to other devs.

We recently switched from Mendix 9 to Mendix 10, and I'm trying to figure out how commits work in Mendix 10. I particularly struggle with the uses for local commits, as i don't see the purpose of this in Mendix, but perhaps it has more to do with how we work with branches.

Best,
Andres