Hi Ahmet Selim Gül,
If there are any conflicts, choose 'Revert to mine' or 'Revert to theirs'.
Conflicted files will be highlighted in red, and your changes will be shown in yellow. If you don’t need your changes, you can revert them.
For nfile directory conflict
install TortoiseGit -> Go to MX Studio pro -> Click on app(left side inside mx studio pro) -> Show file directory -> Right click at empty area after opening file directory -> Click Show more options -> Select TortoiseGit & then click resolve
Hi Ahmet,
First install TortoiseGit -> Go to MX Studio pro -> Click on app(left side inside mx studio pro) -> Show file directory -> Right click at empty area after opening file directory -> Click Show more options -> Select TortoiseGit & then click resolve.
You can resolve your conflicts using this.