Resolve merge conflicts between Upgrade and main branches#23
Merged
Conversation
* 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)
Merged
- 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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR #21 had merge conflicts in
index.htmlandstyle.cssdue to divergent styling approaches and the addition of Godbolt links.Changes
Result
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.