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 the project_settings_override file when in editor #77459

Merged
merged 1 commit into from May 31, 2023
Merged

Ignore the project_settings_override file when in editor #77459

merged 1 commit into from May 31, 2023

Conversation

ghost
Copy link

@ghost ghost commented May 25, 2023

Fixes #70659
Fixes #77424

Extend the PR #55230, also ignoring the "project_settings_override" file.

@ghost ghost self-requested a review as a code owner May 25, 2023 04:38
@akien-mga akien-mga added bug topic:core topic:editor cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:4.0 labels May 25, 2023
@akien-mga akien-mga added this to the 4.1 milestone May 25, 2023
@akien-mga akien-mga requested a review from KoBeWi May 25, 2023 06:32
@YuriSizov YuriSizov changed the title Ignore the project_settings_override file when in editor Ignore the project_settings_override file when in editor May 31, 2023
@YuriSizov YuriSizov merged commit eb5e0e0 into godotengine:master May 31, 2023
13 checks passed
@YuriSizov
Copy link
Contributor

Thanks, and congrats on your first merged Godot PR!

@ghost ghost deleted the fix-override-merging-into-project-godot branch May 31, 2023 14:43
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.0.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cherrypick:3.x Considered for cherry-picking into a future 3.x release topic:core topic:editor
Projects
None yet
5 participants