Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore conflicts with decls that are not generated #1925

Merged
merged 2 commits into from
Mar 9, 2025

Conversation

duckdoom5
Copy link
Contributor

Title

@duckdoom5
Copy link
Contributor Author

I'll fix the error later today/tomorrow

@duckdoom5 duckdoom5 force-pushed the fix/invalid-rename-pass-conflicts branch from 7f5892f to b597250 Compare March 9, 2025 10:49
@duckdoom5
Copy link
Contributor Author

@tritao This is ready for review now :)

@tritao tritao merged commit f58974a into mono:main Mar 9, 2025
10 checks passed
@duckdoom5 duckdoom5 deleted the fix/invalid-rename-pass-conflicts branch March 9, 2025 12:55
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