new-git/Assets/Better Git/Arbitrator/Editor/Services/PullConflictSource.cs

// Copyright (c) 2025 TerraByte Inc.
//
// An implementation of IConflictSource specifically for handling conflicts
// that arise from a 'git pull' operation.

using Terra.Arbitrator.Promises;
using System.Collections.Generic;

namespace Terra.Arbitrator.Services
{
    /// <summary>
    /// Handles the resolution of conflicts from a git pull.
    /// </summary>
    public class PullConflictSource : IConflictSource
    {
        public string MineLabel => "Your Local Changes";
        public string TheirsLabel => "Incoming Remote Changes";

        public IPromise<string> Resolve(List<GitChange> resolutions)
        {
            return GitService.PullAndOverwrite(resolutions);
        }
    }
}