-
Notifications
You must be signed in to change notification settings - Fork 15
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
diverging master and main/develop architecture #24
Comments
Hi @flynneva, |
ok, so should I delete the |
we'll have to merge over the changes from main though that have been accumulating |
Actually, I would say it doesn't matter if the main development is on |
I think using develop makes sense, just we need to now merge over the trigger changes that were merged into master into develop I think |
@SherifN ok so I think i've brought over all the missing changes to develop from master and now I'm making one more PR back to master to make sure they are even. this should close this issue but it would be great if someone could test these changes - i do not have access to an IDS peak camera anymore. |
I most likely made some mistakes while rebasing since there were a bunch of conflicts, so it would be great to get it tested |
@SherifN If you'd like I think we can remove the |
@SherifN i think we should talk about and decide on a direction on if to continue with the
master
as the default branch or switch to just having amain
branch.what do you think?
The text was updated successfully, but these errors were encountered: