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.

Sign up for GitHub

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

Jump to bottom

Fix EditorUndoRedoManager's handling of MERGE_ENDS #74460

Merged
merged 1 commit into from
Mar 6, 2023
Merged

Fix EditorUndoRedoManager's handling of MERGE_ENDS #74460

merged 1 commit into from
Mar 6, 2023

Conversation

KoBeWi
Copy link
Member

@KoBeWi KoBeWi commented Mar 6, 2023

Fixes #74239, unless I misunderstood the issue. (and even if I did, the PR still fixes a bug)

@KoBeWi KoBeWi added this to the 4.1 milestone Mar 6, 2023
akien-mga
akien-mga approved these changes Mar 6, 2023
View reviewed changes
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Seems good. Needs rebase to fix CI.

@akien-mga akien-mga merged commit 9fa3208 into godotengine:master Mar 6, 2023
@akien-mga
Copy link
Member

Thanks!

@KoBeWi KoBeWi deleted the undo_mergundo branch March 6, 2023 10:18
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.0.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akien-mga akien-mga akien-mga approved these changes

Assignees
No one assigned
Labels
bug regression topic:editor
Projects
None yet
Milestone
4.1
Development

Successfully merging this pull request may close these issues.

[Godot 4]History do not save properties
3 participants
@KoBeWi @akien-mga @YuriSizov