Skip to content

Resolve PR #31 merge conflicts - #36

Closed
kasuken with Copilot wants to merge 3 commits into
mainfrom
copilot/solve-merge-issues
Closed

Resolve PR #31 merge conflicts#36
kasuken with Copilot wants to merge 3 commits into
mainfrom
copilot/solve-merge-issues

Conversation

Copilot AI commented Jul 27, 2026

Copy link
Copy Markdown
Contributor

Resolves conflicts between GitHub Enterprise compatibility and newer quota refresh enhancements, preserving both feature sets.

  • Enterprise authentication

    • Retains GitHub.com and GitHub Enterprise provider selection.
    • Supports configured authentication provider and Enterprise API base URL.
  • Data fetching

    • Combines configurable /copilot_internal/user endpoint construction with the existing request timeout handling.
  • Refresh behavior

    • Extends loadCopilotData options to support both provider selection and freshness guards.
    • Preserves polling backoff, focus-aware refreshes, and existing quota/history behavior.
const data = await fetchCopilotUserData(session.accessToken, apiBaseUrl);

@kasuken

kasuken commented Jul 27, 2026

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Jul 27, 2026

Copy link
Copy Markdown
Contributor Author

@copilot resolve the merge conflicts in this pull request

Resolved in 6471c92 (Resolve PR 31 merge conflicts).

Copilot AI requested a review from kasuken July 27, 2026 11:16
@kasuken

kasuken commented Jul 27, 2026

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Jul 27, 2026

Copy link
Copy Markdown
Contributor Author

@copilot resolve the merge conflicts in this pull request

The conflict resolution is in merge commit 6471c92. PR #31 remains marked dirty because its fork head is still b6ba340; that commit must be incorporated into fsapro:feat/ghe-compatibility (or the resolution branch merged into main) for GitHub to update PR #31’s mergeability.

@kasuken kasuken closed this Jul 27, 2026
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.

3 participants