Module conflict_resolver

Module conflict_resolver 

Source
Expand description

Conflict resolution strategies for generated files

Implements multiple strategies for handling file conflicts:

  • Skip: Don’t write conflicting files
  • Overwrite: Write and backup original
  • Merge: Attempt intelligent merge
  • Prompt: Ask user for each conflict

Implements requirements:

  • Requirement 4.2: Skip strategy - don’t write conflicting files
  • Requirement 4.3: Overwrite strategy - write and backup original
  • Requirement 4.4: Merge strategy - attempt intelligent merge
  • Requirement 4.5: Prompt strategy - ask user for each conflict

Structs§

ConflictResolutionResult
Result of applying a conflict resolution strategy
ConflictResolver
Resolves file conflicts using specified strategy

Enums§

ConflictStrategy
Strategy for resolving file conflicts