feat(KB-023): add smart automatic merge conflict resolution
- Add conflict classification API: classifyConflict(), getConflictedFiles(), resolveWithOurs(), resolveWithTheirs(), resolveTrivialWhitespace()
- Auto-resolve lock files (ours), generated files (theirs), and trivial whitespace conflicts
- Add smartConflictResolution setting (alias for autoResolveConflicts)
- Track resolution path via resolutionMethod and autoResolvedCount in MergeResult
- Implement 3-attempt retry logic with escalating strategies in aiMergeTask
- Export pattern constants LOCKFILE_PATTERNS and GENERATED_PATTERNS
5993264e25