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

Merge current into next #251

Merged
merged 5 commits into from
Feb 15, 2023
Merged

Merge current into next #251

merged 5 commits into from
Feb 15, 2023

Conversation

aleokdev
Copy link
Contributor

Again, for 0.10.3 changes.

@aleokdev aleokdev changed the base branch from current to next February 13, 2023 15:56
@aleokdev
Copy link
Contributor Author

I'm not sure if this will absolutely botch next's history.

@bjorn
Copy link
Member

bjorn commented Feb 13, 2023

I'm not sure if this will absolutely botch next's history.

I think this looks fine. I would just suggest to not use the merge button on GitHub, but to push your existing merge commit from command-line now, to avoid GitHub adding another useless merge commit.

@aleokdev aleokdev merged commit 5300147 into mapeditor:next Feb 15, 2023
@aleokdev aleokdev deleted the merge-current branch February 15, 2023 16:36
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.

None yet

2 participants