Sync fork with upstream by discarding redundant commits

[Copilot]

Fork nudeps/overrides is 5 commits ahead of jspm/overrides with identical file trees (same tree hash 6ad4c19). The extra commits are redundant — duplicate fixes and merge bookkeeping that upstream already contains via separate PRs.

Redundant commits to discard

• 24c1b2a Add package.json
• a5ae76b Remove trailing whitespace
• 3094f26 Fix Vue override (duplicate of upstream 4d1195a)
• 445178c Rebase 2 upstream commits
• ae28eca Merge branch 'jspm:main' into main

Resolution

This cannot be resolved via a normal PR merge — it requires a history reset. Two equivalent options:

Option A: CLI

git remote add upstream https://github.com/jspm/overrides.git
git fetch upstream
git checkout main
git reset --hard upstream/main
git push --force-with-lease origin main

Option B: GitHub UI

• Go to repo → Sync fork → Discard 5 commits

Both reset main to upstream's 4d1195a, eliminating the divergent history.

---

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.