Skip to content

Resolve merge conflicts between Upgrade and main branches#23

Merged
andyD123 merged 4 commits into
Upgradefrom
copilot/sub-pr-21-again
Dec 23, 2025
Merged

Resolve merge conflicts between Upgrade and main branches#23
andyD123 merged 4 commits into
Upgradefrom
copilot/sub-pr-21-again

Conversation

Copilot AI commented Dec 22, 2025

Copy link
Copy Markdown
Contributor

PR #21 had merge conflicts in index.html and style.css due to divergent styling approaches and the addition of Godbolt links.

Changes

  • Merged main's CSS: Adopted main's gradient-based design system with improved spacing, table styling, and color variables
  • Preserved Godbolt links: Integrated Compiler Explorer and Runtime comparison links inline within the subtitle
  • Added link styling: Applied accent color and hover transitions to subtitle anchors for visual consistency

Result

<p class="subtitle">Interactive Dynamic Programming Visualization | 
    <a href="https://godbolt.org/z/4MenTYK6E" target="_blank">Compiler Explorer ↗</a> | 
    <a href="https://godbolt.org/z/b3x3ao14K" target="_blank">Runtime comparison ↗</a>
</p>
.subtitle a {
    color: var(--accent);
    text-decoration: none;
    transition: color 0.15s ease;
}

Once this PR merges into Upgrade, PR #21 will be clear to merge into main.


💡 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.

andyD123 and others added 2 commits December 20, 2025 20:33
* vcproj update

* change number of steps to compare tree to wilmott article https://wilmott.com/automatic-for-the-greeks/

* getting local builds working again

* update demo code with comparison and pairwise reduce

* add interactive matrix chain DP visualization (C++ on sea demo)
Copilot AI added 2 commits December 22, 2025 23:51
- Integrated Godbolt links from Upgrade branch into main's styling
- Kept main branch's improved CSS design with gradient backgrounds
- Added link styling to subtitle for Godbolt links
- Resolved conflicts in index.html and style.css
Copilot AI changed the title [WIP] Update CSS sheet for matrix dp example Resolve merge conflicts between Upgrade and main branches Dec 23, 2025

@andyD123 andyD123 left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

Copilot AI requested a review from andyD123 December 23, 2025 00:00
@andyD123 andyD123 marked this pull request as ready for review December 23, 2025 00:01
@andyD123 andyD123 merged commit 09c7627 into Upgrade Dec 23, 2025
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