Resolve git merge conflicts and push a fix

Reported experience

1. 1

   What they did

   After a git pull leaves conflict markers in a file, you point Scout at that file. It reads the markers, compares both versions of the code, and proposes a merged file for you to review. The article describes committing and pushing to a branch as a separate Scout workflow. Scout checks the diff, drafts a commit message, creates the branch and pushes. By default you approve each command before it runs.

2. 2

   How it went

   The article describes the workflow but reports no measured results, timings or real-repo example. Merge resolution is covered in only a few sentences, and the article doesn't say how well it handles complex conflicts.

3. 3

   Worth knowing

   Scout needs enterprise access: Frontier preview enrollment, an Intune device policy, and Microsoft 365 Copilot plus GitHub Copilot Business or Enterprise licenses. Personal accounts can't sign in.