See Pros and cons of using a VCS (git etc.) with KiCad. Basically, due to the nature of 2D (or 3D) graphics, reliable merge strategy is impossible within one file. Schematic can be split into hierarchical sheets. PCB would need “design blocks” which is in the wishlist but apparently in limbo.