0
\$\begingroup\$

When working on a project with a group of people it is often required to merge changes someone else has made into a master version of the project. However my EDA of chocie, KiCAD, does not seem to support this. I've seen alot of people doing version control in git. However after trying this the merge conflicts are horrifying. Altium seems to have a nice tool to do this however I would like to stay with KiCAD. I am trying to find a way to do a diff on revisions of a board and schematics, can KiCAD do this?

\$\endgroup\$
2

1 Answer 1

1
\$\begingroup\$

Not yet.

There is a plan to implement it, but this is a hard problem, because text based diff/merge operates on one-dimensional data, while schematics have two, and board design files have three dimensions. There is no sensible way to normalize the data in order to get minimal diffs.

\$\endgroup\$

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Not the answer you're looking for? Browse other questions tagged or ask your own question.