public static void ResolveConflicts(string path, MergeFileFavor favor)
{
if(!GitManager.IsValidRepo) return;
if (favor == MergeFileFavor.Normal)
{
GitExternalManager.HandleConflict(path);
}
else if (favor == MergeFileFavor.Ours)
{
var conflict = GitManager.Repository.Index.Conflicts[path];
var ours = conflict.Ours;
if (ours != null)
{
GitManager.Repository.Index.Remove(ours.Path);
GitManager.Repository.CheckoutPaths("ORIG_HEAD", new[] { ours.Path });
}
}
else if (favor == MergeFileFavor.Theirs)
{
var conflict = GitManager.Repository.Index.Conflicts[path];
var theirs = conflict.Theirs;
if (theirs != null)
{
GitManager.Repository.Index.Remove(theirs.Path);
GitManager.Repository.CheckoutPaths("MERGE_HEAD", new[] { theirs.Path });
}
}
//Debug.Log(EditorUtility.InvokeDiffTool(Path.GetFileName(theirs.Path) + " - Theirs", conflictPathTheirs, Path.GetFileName(ours.Path) + " - Ours", conflictPathOurs, "", conflictPathAncestor));
}
public static void ResolveConflicts(string path, MergeFileFavor favor)
{
if (!GitManager.IsValidRepo)
{
return;
}
if (favor == MergeFileFavor.Normal)
{
Object asset = AssetDatabase.LoadAssetAtPath(path, typeof(Object));
var arg = new CancelEventArgs();
if (OnHandleConflictEvent != null)
{
OnHandleConflictEvent.Invoke(path, asset, arg);
}
if (arg.Cancel)
{
return;
}
var conflict = GitManager.Repository.Index.Conflicts[path];
var ancestor = conflict.Ancestor;
var ours = conflict.Ours;
var theirs = conflict.Theirs;
var ancestorBlob = (ancestor != null) ? (Blob)GitManager.Repository.Lookup(ancestor.Id) : null;
var ourBlob = (ours != null) ? (Blob)GitManager.Repository.Lookup(ours.Id) : null;
var theirBlob = (theirs != null) ? (Blob)GitManager.Repository.Lookup(theirs.Id) : null;
var ourStream = (ours != null) ? ourBlob.GetContentStream(new FilteringOptions(ours.Path)) : null;
var theirStream = (theirs != null) ? theirBlob.GetContentStream(new FilteringOptions(theirs.Path)) : null;
var ancestorStream = (ancestor != null) ? ancestorBlob.GetContentStream(new FilteringOptions(ancestor.Path)) : null;
var conflictPathOurs = Application.dataPath.Replace("Assets", "Temp/our_conflict_file_tmp");
var conflictPathTheirs = Application.dataPath.Replace("Assets", "Temp/their_conflict_file_tmp");
var conflictPathAncestor = Application.dataPath.Replace("Assets", "Temp/ancestor_conflict_file_tmp");
if (ourStream != null)
{
using (var ourOutputStream = File.Create(conflictPathOurs))
{
ourStream.CopyTo(ourOutputStream);
}
}
if (theirStream != null)
{
using (var theirOutputStream = File.Create(conflictPathTheirs))
{
theirStream.CopyTo(theirOutputStream);
}
}
if (ancestorStream != null)
{
using (var ancestorOutputStream = File.Create(conflictPathAncestor))
{
ancestorStream.CopyTo(ancestorOutputStream);
}
}
GitExternalManager.HandleConflict(conflictPathTheirs, conflictPathOurs, conflictPathAncestor, path, asset.GetType());
}
else if (favor == MergeFileFavor.Ours)
{
var conflict = GitManager.Repository.Index.Conflicts[path];
var ours = conflict.Ours;
if (ours != null)
{
GitManager.Repository.Index.Remove(ours.Path);
GitManager.Repository.CheckoutPaths("ORIG_HEAD", new[] { ours.Path });
}
}
else if (favor == MergeFileFavor.Theirs)
{
var conflict = GitManager.Repository.Index.Conflicts[path];
var theirs = conflict.Theirs;
if (theirs != null)
{
GitManager.Repository.Index.Remove(theirs.Path);
GitManager.Repository.CheckoutPaths("MERGE_HEAD", new[] { theirs.Path });
}
}
//Debug.Log(EditorUtility.InvokeDiffTool(Path.GetFileName(theirs.Path) + " - Theirs", conflictPathTheirs, Path.GetFileName(ours.Path) + " - Ours", conflictPathOurs, "", conflictPathAncestor));
}
