I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
* regenerate protobuf with bh1750 TelemetrySensorType
* Added wollewald/BH1750_WE@^1.1.10 dependecy
* Added support for BH1750 during i2C detection
* Create new BH1750Sensor and added in EnvironmentTelemetry
* clean code
* Attempt to fix protobuf include
---------
Co-authored-by: Tom Fifield <tom@tomfifield.net>