Skip to Content
0
Former Member
Jul 04, 2013 at 08:37 AM

Regi mergeTool

43 Views

Hello All

When I try to commit my SAPUI5 Application project to my SAP HANA Repository (using SAP HANA Studio version 1.0.56), I get the following error message:

Could not commit file MyFile.xsappsite

Could not commit file 'MyFile.xsappsite' in package 'myPackage'. Failed to commit: "mypackage\MyFile.xsappsite".

The file is still in the set of conflicts.

Use "regi mergeTool" or "regi resolve" to resolve the conflict(s).

Where can I find regi mergeTool? (The entry ContextMenu>Team>Merge Tool is disabled).

By the way: I didn't change the file. When I compare the file with the active version or any version from local history (ContextMenu>Compare with>...), I cannot detect any differences.

Thanks

Christoph