search

slaclab / pysmurf

Other
2 stars 9 forks source link

Main vs Develop Branches #671

Closed kmharrington closed 2 years ago

kmharrington commented 2 years ago

Describe the bug

This commit was sent to main instead of develop and that's breaking things farther down in SO testing. I tried switching to main but it seems like there's still differences between the two branches and I'm getting other errors.

Additional details

Could we apply that commit to both branches? As soon as possible?

agustiner commented 2 years ago

Hi, Katie. Jack recently merged that commit into develop, so hopefully that fixes your issue. Because main and develop haven't been merged since about February, they have diverged significantly (see https://github.com/slaclab/pysmurf/compare/develop). I'll try and figure out a good solution to this problem.

Agustin