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:
@@ -38,5 +38,4 @@
|
||||
|
||||
// user button is present on device, but currently untested & unconfigured - couldn't figure out how it's connected
|
||||
|
||||
// battery support is present within device, but currently untested & unconfigured - couldn't find reliable information
|
||||
// yet
|
||||
// battery support is present within device, but currently untested & unconfigured - couldn't find reliable information yet
|
||||
Reference in New Issue
Block a user