combining-changes-and-conflict-resolution

[Chris-Karona]

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

Page link: combining-changes-and-conflict-resolution

Document link: merge-algorithm.md

My Issue/Suggestion

This refers to file conflicts (5.1.3) but makes no mention of how to resolve them. Previously this was done using TortoiseSVN. How is it done now?
(I encountered a conflict in a file I had not explicitly touched and the result is very confusing).

Also there is a reference to the fact that Rebase is only available if using Git at version 2.41.0 or above but no indication of where to go to upgrade.

I already had Git installed because I have previously needed it to build native apps in Mx 9 with custom templates but I am having trouble working out what separation there is between what I was using then and what is being used by Mx Studio 10. I cannot discern where the local repository is for my new Mx 10 app or what client tools I may need to use if there are actions external to Mx Studio Pro - such as the file conflicts.

Thank you for considering these points.