Skip to content

Ignore conflicts with decls that are not generated#1925

Merged
tritao merged 2 commits intomono:mainfrom
duckdoom5:fix/invalid-rename-pass-conflicts
Mar 9, 2025
Merged

Ignore conflicts with decls that are not generated#1925
tritao merged 2 commits intomono:mainfrom
duckdoom5:fix/invalid-rename-pass-conflicts

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