Jernej Simončič �Jul 6
Tube Time

so i accidentally did work on a KiCad layout from two different machines and ended up having to merge the two commits. to a PCB layout. but you know what? it *somehow* just worked!

i was bracing myself for a horrible cleanup job, but somehow everything just worked. i'm impressed.

Jul 6 at 4:02amWeb
Show thread✧✦Catherine✦✧Jul 6
@tubetime that's amazing
Show threadTube TimeJul 6
@whitequark software has abused me for so long that when something works this well, i'm left speechless
Show thread✧✦Catherine✦✧Jul 6
@tubetime same
Show threadjasegJul 6
@tubetime @whitequark didn’t someone build a visual diff handler for kicad schematics a while back?
Show threadPixel PurritoJul 6
@tubetime @whitequark this is so relatable!
Show threadEric DouglasJul 6
@tubetime 400HZ, YAW, PITCH, and ROLL… looks intriguing!
Show threadRicardusJul 6
@eric_douglas @tubetime Apollo related I'm sure.
Show threadJean-Baptiste "JBQ" QuéruJul 6
@tubetime Good file formats are designed so that they have a reasonable chance that a merge will make sense.
Show thread[SUYA] ひみつ  Jul 6
@tubetime does it use git or something?
Show threadAnton FellingerJul 6
Where is the tooobs here?
Show threadTube TimeJul 6
@fullrange off board
Show threadHans HübnerJul 6

@tubetime Several smart things playing together:

- Use text as basic file format
- Include plenty newlines
- Object identity preservation

Order preservation of elements in data structures may have been less of a conscious choice.

Show threaddoragasuJul 6
@tubetime Never would have thought that would end well, Awesome!
Show threadÖlbaumJul 9
@tubetime Did you do that merge in git, or is it a KiCad feature?
Show threadTube TimeJul 10
@oscherler i just did it from git.