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.
* Add on-screen keyboard implementation on Trackball device.
* Update On-Screen Keyboard to new layout.
* The on-screen keyboard dynamically adjusts the key size based on the screen.
* Improve input box display on small screens.
* Optimize the virtual keyboard layout and cursor movement logic, and adjust the keyboard starting position for small and wide screens.
* Optimize the text alignment of numeric keys on ssd1306.
---------
Co-authored-by: whywilson <m.tools@qq.com>
* Add on-screen keyboard implementation on Wio Tracker L1.
* Update On-Screen Keyboard to new layout.
* The on-screen keyboard dynamically adjusts the key size based on the screen.
* Improve input box display on small screens.
* Optimize the virtual keyboard layout and cursor movement logic, and adjust the keyboard starting position for small and wide screens.
* Optimize the text alignment of numeric keys on ssd1306.
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
