Skip to content

Development combined fixed merge#95

Closed
TebelR wants to merge 16 commits into
developmentfrom
development-combined-fixed
Closed

Development combined fixed merge#95
TebelR wants to merge 16 commits into
developmentfrom
development-combined-fixed

Conversation

@TebelR

@TebelR TebelR commented Mar 28, 2026

Copy link
Copy Markdown
Collaborator

The development-combined had commits that fixed all the issues in development, but git was having trouble with histories between that branch and development.

The development-combined-fixed took a hard reset of development and merged it into development-combined locally. This should now merge into development without issues.

@TebelR TebelR closed this Mar 28, 2026
@TebelR TebelR deleted the development-combined-fixed branch March 31, 2026 01:16
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.

1 participant