ok so update

ini is just the old project format (.pro)

json is just the new project format (.kicad_pro)

s-expressions are used for schematics, layouts, symbols, footprints, etc

so if you start a new project today it's just sexp and json

i'm realllly not sure why they dumped json in there just for the kicad_pro file tho
makes no sense

kicad supports version control with git but provides no specialized merge tool which i think is kind of bad
they should have a graphical merge tool (pretty difficult probably, but would be rly useful) and then set up git to use it (not hard)

Follow

@haskal there's already a very cool kicad diff viewer (albeit not integrated in normal kicad), should be a few steps from there to have merging twitter.com/maholli404/status/

Sign in to participate in the conversation
Pixietown

Small server part of the pixie.town infrastructure. Registration is closed.