Skip to content

Conversation

Copy link
Contributor

Copilot AI commented Dec 28, 2025

PR #8000 had merge conflicts preventing it from being merged into main. The conflicts arose from overlapping changes in check_permissions_utils.cjs between PR #8000's error handling refactor and PR #8007's TypeScript compilation fixes.

Changes

Implementation

Replaced manual error message extraction pattern:

// Before
const errorMessage = error instanceof Error ? error.message : String(error);

With consistent helper usage:

// After
const { getErrorMessage } = require("./error_helpers.cjs");
// ...
const errorMessage = getErrorMessage(error);

This consolidates error handling logic into a single reusable helper, improving maintainability and consistency across 65+ JavaScript files in the codebase.

Original prompt

Apply changes from #8000 to main to resolve merge conflicts.


✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
Copilot AI changed the title [WIP] Resolve merge conflicts from PR #8000 Apply PR #8000: Refactor error handling to use getErrorMessage helper Dec 28, 2025
Copilot AI requested a review from pelikhan December 28, 2025 23:33
@pelikhan pelikhan marked this pull request as ready for review December 28, 2025 23:35
@pelikhan pelikhan merged commit d143a1b into main Dec 28, 2025
44 checks passed
@pelikhan pelikhan deleted the copilot/resolve-merge-conflicts branch December 28, 2025 23:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants