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

diverging master and main/develop architecture #24

Open
flynneva opened this issue Aug 17, 2021 · 8 comments
Open

diverging master and main/develop architecture #24

flynneva opened this issue Aug 17, 2021 · 8 comments

Comments

@flynneva
Copy link
Collaborator

@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 a main branch.

what do you think?

@SherifN
Copy link
Owner

SherifN commented Aug 17, 2021

Hi @flynneva,
thanks for bringing this up! In my opinion it makes sense to mainly work on the develop branch and adding the PR‘s there, such that the master branch can be utilized as „release“ branch.
:)

@flynneva
Copy link
Collaborator Author

ok, so should I delete the main branch then so we dont get confused?

@flynneva
Copy link
Collaborator Author

we'll have to merge over the changes from main though that have been accumulating

@SherifN
Copy link
Owner

SherifN commented Aug 19, 2021

Actually, I would say it doesn't matter if the main development is on develop or main. The only thing is that it would be great to have a clear separation from the master.
So as you prefer, either "moving" to develop or using main :)
I would delete the unused branch though.

@flynneva
Copy link
Collaborator Author

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

@flynneva
Copy link
Collaborator Author

@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.

@flynneva
Copy link
Collaborator Author

I most likely made some mistakes while rebasing since there were a bunch of conflicts, so it would be great to get it tested

@flynneva
Copy link
Collaborator Author

I would delete the unused branch though.

@SherifN If you'd like I think we can remove the main branch now

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 a pull request may close this issue.

2 participants