Skip to content

fix: remove duplicate imports in nextcloudUtils.spec.ts introduced by merge conflict resolution#836

Merged
skjnldsv merged 7 commits intomasterfrom
copilot/upgrade-octokit-app-deprecated-methods
Mar 18, 2026
Merged

fix: remove duplicate imports in nextcloudUtils.spec.ts introduced by merge conflict resolution#836
skjnldsv merged 7 commits intomasterfrom
copilot/upgrade-octokit-app-deprecated-methods

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Mar 18, 2026

The merge commit resolving conflicts between master and this branch accidentally kept both sides of a conflict in the import block, resulting in duplicate identifiers that cause TypeScript TS2300 errors.

Changes

  • src/nextcloudUtils.spec.ts: Remove redundant lines 5–6 (a subset re-import of getBackportBody, getMilestoneFromBase, and several constants from ./constants). Lines 3–4 already contain the complete superset of all required imports.

Before:

import { getBackportBody, getFailureCommentBody, getLabelsForPR, getMilestoneFromBase } from './nextcloudUtils'
import { LABEL_BACKPORT, LABEL_TO_REVIEW, LEARN_MORE, STEP_AMEND_SKIP_CI, STEP_REMOVE_EMPTY_COMMITS, STEP_REVIEW_CHANGES, STEP_REVIEW_CONFLICTS, Task, WARN_CONFLICTS, WARN_DIFF } from './constants'
import { getBackportBody, getMilestoneFromBase } from './nextcloudUtils'          // ← duplicate
import { LEARN_MORE, STEP_AMEND_SKIP_CI, ... WARN_DIFF } from './constants'      // ← duplicate

After:

import { getBackportBody, getFailureCommentBody, getLabelsForPR, getMilestoneFromBase } from './nextcloudUtils'
import { LABEL_BACKPORT, LABEL_TO_REVIEW, LEARN_MORE, STEP_AMEND_SKIP_CI, STEP_REMOVE_EMPTY_COMMITS, STEP_REVIEW_CHANGES, STEP_REVIEW_CONFLICTS, Task, WARN_CONFLICTS, WARN_DIFF } from './constants'

📍 Connect Copilot coding agent with Jira, Azure Boards or Linear to delegate work to Copilot in one click without leaving your project management tool.

Copilot AI and others added 2 commits March 18, 2026 09:04
Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>
… calls

Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>
Copilot AI changed the title [WIP] Update @octokit/app and adjust for deprecated methods Upgrade @octokit/app to v16 and fix deprecated legacy REST method calls Mar 18, 2026
Copilot AI requested a review from skjnldsv March 18, 2026 09:08
@skjnldsv
Copy link
Copy Markdown
Member

Think you could add some runtime test @copilot ?

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 18, 2026

Codecov Report

❌ Patch coverage is 86.00000% with 7 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
src/githubUtils.ts 0.00% 7 Missing ⚠️

📢 Thoughts on this report? Let us know!

@skjnldsv skjnldsv marked this pull request as ready for review March 18, 2026 09:15
…dy, and getFailureCommentBody

Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>
Copilot AI changed the title Upgrade @octokit/app to v16 and fix deprecated legacy REST method calls Add runtime tests for untested pure functions Mar 18, 2026
…ds - resolve nextcloudUtils.spec.ts conflict

Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>
Copilot AI changed the title Add runtime tests for untested pure functions Add runtime tests for utility functions Mar 18, 2026
…hods

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
…ed by merge commit

Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>
Copilot AI changed the title Add runtime tests for utility functions fix: remove duplicate imports in nextcloudUtils.spec.ts introduced by merge conflict resolution Mar 18, 2026
@skjnldsv skjnldsv merged commit f9c4053 into master Mar 18, 2026
9 checks passed
@skjnldsv skjnldsv deleted the copilot/upgrade-octokit-app-deprecated-methods branch March 18, 2026 10:11
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