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

CSUB-905: WIP: Rebase against latest upstream and skip all conflicting commits #109

Conversation

atodorov
Copy link
Collaborator

Note: this only partially brings forward some of the changes made as part of this fork. #108 which are causing conflicts have been skipped because they need more work.

@atodorov atodorov changed the title WIP: Rebase against latest upstream and skip all conflicting commits CSUB-905: WIP: Rebase against latest upstream and skip all conflicting commits Nov 17, 2023
@atodorov atodorov closed this Nov 22, 2023
@atodorov atodorov deleted the rebase-against-latest-upstream-skip-all-conflicting-commits branch November 22, 2023 15:37
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.

3 participants