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.
This commit is contained in:
@@ -9,10 +9,11 @@
|
||||
* to your device as you wish, but you always need to have separate event
|
||||
* handlers, thus you need to have a RotaryEncoderInterrupt implementation.
|
||||
*/
|
||||
class SerialKeyboardImpl : public SerialKeyboard {
|
||||
public:
|
||||
SerialKeyboardImpl();
|
||||
void init();
|
||||
class SerialKeyboardImpl : public SerialKeyboard
|
||||
{
|
||||
public:
|
||||
SerialKeyboardImpl();
|
||||
void init();
|
||||
};
|
||||
|
||||
extern SerialKeyboardImpl *aSerialKeyboardImpl;
|
||||
Reference in New Issue
Block a user