search

SherifN / peak_cam

A Linux ROS C++ Node that wraps the driver API for IDS vision cameras using IDS peak software.
Other
8 stars 13 forks source link

diverging master and main/develop architecture #24

Open flynneva opened 3 years ago

flynneva commented 3 years ago

@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 commented 3 years ago

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 commented 3 years ago

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

flynneva commented 3 years ago

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

SherifN commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

@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 commented 3 years ago

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 commented 3 years ago

I would delete the unused branch though.

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