Support

Email me at tyler@leducsystems.com. I build PR Conflict Resolver and answer support email myself, usually within one business day (Arizona time).

Please include your Azure DevOps organization name, the pull request's repository and branch names (not the code), what you expected, what happened, and the text of any error message. Please do not send code unless I ask for it.

Common questions

I do not see the Resolve conflicts tab. The tab is on pull requests in Azure Repos. Check that the extension is installed and enabled under Organization settings, Extensions.

Apply failed for one file. Each file is applied separately, so the others still went through. The message says why, usually a missing permission (you need Contribute on the repository) or a pull request that changed since you opened it. Your draft for the failed file is kept.

A file is too large to edit. Above 2 MB, or more than 20,000 changed lines, the file is not loaded into the editor. Pick the source or target version for that file.

My draft is gone. Drafts made for an older version of the pull request are set aside rather than applied. Reopen the pull request and resolve against the current version.