Merging with p4merge and V2.0 question

[barts2108]

First I like to ask: Is version 2.0 already available in the add-in manager in Xamarin ?

With V1.7 of the plugin, I am trying to use p4merge as merging tool in case of conflicts. However I cannot find a way to get the merged file to be the latest in my workspace (and ready for checkin)

Do you know how to configure the merge tool on Xamarin (5.8.2 on OSX) to use p4merge ? If not, can you reccommend a merge tool on OSX that works and provide the configuration for xamarin ?

BTW: I downloaded the code to look at the merging implementation, and I noticed that the base file will always be writeen to the workspace

    private void StartMerging()
    {
        var conflict = listStore.GetValue(listView.SelectedRow, itemField);
        var baseFile = workspace.DownloadToTemp(conflict.BaseDowloadUrl);
        var theirsFile = workspace.DownloadToTemp(conflict.TheirDowloadUrl);

        .....

        //Move merged base file to target.
        baseFile.MoveTo(conflict.TargetLocalItem, true);
        theirsFile.Delete();
        EndMerging();
    }

Should this baseFile.MoveTo have been the merged outcome of the merge tool? I have tried to save the merge result into the baseFile, but that does not work. It simply copies the original basefile to the workspace.

Furthermore, I think somehow the returnvalue from the merge tool process should also be handled to see if the user has canceled the merge tool without accepting a merge. In such case the conflict should still be there.