conflict

Documentation

Index

• type Block
  • func ParseFile(path string) ([]Block, error)
• type Complexity
  • func Classify(b Block) Complexity
• type Explanation
  • func Explain(ctx context.Context, client *ai.Client, b Block) (*Explanation, error)

Types

type Block

type Block struct {
	FilePath           string
	OursLines          []string
	TheirsLines        []string
	BaseLines          []string
	StartLine          int
	EndLine            int
	SurroundingContext string
	Language           string
}

func ParseFile

func ParseFile(path string) ([]Block, error)

type Complexity

type Complexity string

const (
	Trivial  Complexity = "trivial"
	Moderate Complexity = "moderate"
	Complex  Complexity = "complex"
)

func Classify

func Classify(b Block) Complexity

type Explanation

type Explanation struct {
	OursIntent          string  `json:"ours_intent"`
	TheirsIntent        string  `json:"theirs_intent"`
	ConflictType        string  `json:"conflict_type"`
	ResolutionStrategy  string  `json:"resolution_strategy"`
	ResolutionRationale string  `json:"resolution_rationale"`
	CandidatePatch      string  `json:"candidate_patch"`
	Confidence          float64 `json:"confidence"`
	RiskNotes           string  `json:"risk_notes"`
}

func Explain

func Explain(ctx context.Context, client *ai.Client, b Block) (*Explanation, error)