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

Develop #47

Closed
wants to merge 94 commits into from
Closed

Develop #47

wants to merge 94 commits into from

Conversation

odungern
Copy link
Contributor

@odungern odungern commented May 6, 2023

First release supporting v1.1

@odungern
Copy link
Contributor Author

odungern commented May 6, 2023

'Resolve Conflicts' doesn't work ...

@odungern odungern closed this May 6, 2023
@odungern odungern reopened this May 6, 2023
@odungern
Copy link
Contributor Author

odungern commented May 6, 2023

Merge too complex. Will change branch names:

  • main --> main-v1.0
  • develop --> main-1.1
    ... and create a new branch new dev-1.1

@odungern odungern closed this May 6, 2023
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