Skip to content

Legacy sampsharp migration#454

Merged
ikkentim merged 16 commits into
masterfrom
legacy-sampsharp-migration
Apr 30, 2026
Merged

Legacy sampsharp migration#454
ikkentim merged 16 commits into
masterfrom
legacy-sampsharp-migration

Conversation

@ikkentim

Copy link
Copy Markdown
Owner

Migrate all code to src/legacy in preparation for importing code from https://github.com/SampSharp/openmp-sampsharp-x64-poc

@ikkentim

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts in this pull request; both commits from master have been cherry picked to the pr branch already.

…gration

Co-authored-by: ikkentim <2820647+ikkentim@users.noreply.github.com>

Copilot AI commented Apr 30, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request; both commits from master have been cherry picked to the pr branch already.

Merged origin/master into the PR branch — no conflicts since both commits were already cherry-picked. Merge commit: 7664908.

@ikkentim

Copy link
Copy Markdown
Owner Author

@copilot in all the workflows, legacy-sampsharp-migration is included in the branches; this was to test the workflows. before we can merge this PR, this branch needs to be removed from the workflows

Copilot AI commented Apr 30, 2026

Copy link
Copy Markdown
Contributor

@copilot in all the workflows, legacy-sampsharp-migration is included in the branches; this was to test the workflows. before we can merge this PR, this branch needs to be removed from the workflows

Removed legacy-sampsharp-migration from the push branches in all 6 workflows. Commit: e9c6ffb.

@ikkentim ikkentim merged commit cc1578d into master Apr 30, 2026
@ikkentim ikkentim deleted the legacy-sampsharp-migration branch April 30, 2026 13:43
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.

3 participants