Scope PR #124 changes to semesters/spring_2026/ only #124
Conversation
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
…pull-requests # Conflicts: # semesters/spring_2026/people.csv
…pull-requests # Conflicts: # semesters/spring_2026/people.csv
…pull-requests # Conflicts: # semesters/spring_2026/people.csv
Copilot
AI
changed the title
[WIP] Merge all open pull requests and resolve conflicts
Merge 15 student profile PRs with conflict resolution
Jan 28, 2026
Co-authored-by: afeld <[email protected]>
Copilot
AI
changed the title
Merge 15 student profile PRs with conflict resolution
Remove Airflow content inadvertently restored by PR #117 merge
Jan 28, 2026
Member
|
@spalle1997 FYI that I'm experimenting with doing the merges via Copilot. |
- Remove course-materials directory - Revert docs/CONTRIBUTING.md to main branch version - Revert labs/lab_01.md to main branch version All changes in PR #124 should be under semesters/spring_2026/ only.
Copilot
AI
changed the title
Remove Airflow content inadvertently restored by PR #117 merge
Scope PR #124 changes to semesters/spring_2026/ only
Jan 28, 2026
Jinxxxx1234
pushed a commit
to Jinxxxx1234/course-materials
that referenced
this pull request
Jan 28, 2026
- Remove course-materials directory - Revert docs/CONTRIBUTING.md to main branch version - Revert labs/lab_01.md to main branch version All changes in PR advanced-computing#124 should be under semesters/spring_2026/ only.
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 #124 merged student profile submissions but inadvertently included changes outside
semesters/spring_2026/.Changes
Reverted files to main branch versions:
course-materials/- Removed empty directory (git submodule artifact)docs/CONTRIBUTING.md- Restored "repository root" languagelabs/lab_01.md- Restored instructor-specific merge instructionsResult
All 29 changes now properly scoped to
semesters/spring_2026/:people.csvOriginal prompt
💡 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.