Skip to content

Resolve merge conflicts for PR #4300#4791

Merged
wirecat merged 1 commit intogithub:mainfrom
kailando:main
Apr 17, 2026
Merged

Resolve merge conflicts for PR #4300#4791
wirecat merged 1 commit intogithub:mainfrom
kailando:main

Conversation

@kailando
Copy link
Copy Markdown
Contributor

Reasons for making this change

I was looking around the open PRs and #4300 caught my eye: "Update Python.gitignore for tempCodeRunnerFile.py"

Links to documentation supporting these rule changes

formulahendry/vscode-code-runner#305

Merge and Approval Steps

  • [v] Confirm that you've read the contribution guidelines and ensured your PR aligns
  • Ensure CI is passing
  • Get a review and Approval from one of the maintainers

ZeroMergeConflicts

This comment was marked as resolved.

@kailando
Copy link
Copy Markdown
Contributor Author

kailando commented Feb 23, 2026 via email

@ZeroMergeConflicts
Copy link
Copy Markdown

ZeroMergeConflicts commented Feb 23, 2026 via email

Copy link
Copy Markdown
Collaborator

@wirecat wirecat left a comment

Choose a reason for hiding this comment

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

Thank you for your contribution!

@wirecat wirecat merged commit f86606d into github:main Apr 17, 2026
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