mirror of
https://github.com/meshtastic/firmware.git
synced 2026-09-30 02:05:22 -04:00
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:
1 parent
0d11331d18
commit
beb268ff25
771 files changed
+83399
-77967
No files matched your search
+1266
-1219
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user