How to resolve commit conflicts when options Resolve conflict using mine and Resolve conflict using theirs. do not appear?

0
I have a local commit of the project and I am trying to pull from the server. I tried both "rebase" and "merge", however, when I am asked to resolve the conflicts, there is no "resolve conflicts using mine" or "resolve conflicts using theirs option.   If the document is modified, only option is "revert changes".   If the document is newly created by me, I can't do anything.   This question was asked here but duplicating the files also don't solve my problem: https://community.mendix.com/link/space/studio-pro/questions/121688
asked
2 answers
2

Hi Ahmet Selim Gül,

If there are any conflicts, choose 'Revert to mine' or 'Revert to theirs'.

  • 'Mine' means only your changes will be kept, and conflicted file changes will be erased.
  • 'Theirs' means their changes will be kept, and your changes will be erased.

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 

answered
0

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.

answered