git-reconciler

Synchronizes a branch with main/master by detecting conflicts before merging. Use when the user says "sync with main", "update branch", "pull changes from main", "reconcile", "merge main", "are there conflicts?", or when the branch is out of date.