Tag 3.1.5.1C on master branch about optohybridv3

[bdorney]

Typically the rule is that all new developments start from the develop branch. I am not sure if @andrewpeck uses a similar procedure for the FW repo. Here is a helpful guide written by @jsturdy for developments for GEM online SW:

sturdy_git_development_manifesto.pdf

[lpetre-ulb]

Thank you for this information. I had already seen that you use git-flow for SW development, but the guide seems more complete.

For the FW development, I do not see any develop branch. However, the TDC is obviously in a new branch considering it is a brand new feature.

[andrewpeck]

I'm not sure I'm following the problem but 6457816 is the most recent commit that you should trust.

I have a whole other slurry of things going on with GE2/1 firmware that will need to be merged in eventually, but at the moment it is a lot better to just stick with 6457816

I'm not sure about the manifesto either--the firmware hasn't really been very collaborative up until this point (just one person working at a time) so I haven't had to worry about much in the way of manifestos :/

I have a development branch in my fork that I'm building new features on but I wouldn't recommend touching it any time soon.. it is a big change from the current firmware to support GE2/1 and its not backwards compatible on the CTP7

[lpetre-ulb]

Thank you for your complete answer, I'll then rebase on commit 6457816.

When I opened the issue, commit 6457816 was not present on master, though the tag 3.1.5.1C referred to it. It is now the HEAD on master, so the issue can be considered closed.