Method resolveConflict

apps/cli/internal/sync/engine.go:218–236

(
	action SyncAction,
	ext ExternalTask,
	mapped MappedTask,
	extHash string,
	ts TaskState,
	state *SyncState,
	now time.Time,
)

}

func (e *Engine) resolveConflict(
	action SyncAction,
	ext ExternalTask,
	mapped MappedTask,
	extHash string,
	ts TaskState,
	state *SyncState,
	now time.Time,
) (SyncAction, error) {
	switch e.ConflictStrategy {
	case ConflictRemote:
		return e.applyExternalUpdate(action, ext, mapped, extHash, ts, state, now)
	case ConflictLocal:
		return e.acceptLocal(action, extHash, ts, state, now)
	default:
		action.Reason = "conflict"
		return action, nil
	}
}

func (e *Engine) acceptLocal(
	action SyncAction,