firmware

mirror/firmware

0 Fork 0

mirror of https://github.com/meshtastic/firmware.git synced 2026-11-02 12:25:51 -05:00

Commit Graph

Author SHA1 Message Date

Author	SHA1	Message	Date
Jorropo	beb268ff25	Revert "add a .clang-format file (#9154 )" (#9172 ) 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`.	2026-01-04 05:15:53 -06:00
Jorropo	0d11331d18	add a .clang-format file (#9154 )	2026-01-03 14:19:24 -06:00
Jonathan Bennett	41cbd77db3	Move everything from /arch to /variant (#8831 )	2025-12-02 08:56:55 +01:00

Jorropo

beb268ff25

Revert "add a .clang-format file (#9154 )" (#9172 )

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.

2026-01-04 05:15:53 -06:00

Jorropo 0d11331d18 add a .clang-format file (#9154 ) 2026-01-03 14:19:24 -06:00

Jonathan Bennett 41cbd77db3 Move everything from /arch to /variant (#8831 ) 2025-12-02 08:56:55 +01:00