Introduction

paplix provides visual diff and conflict resolution tools for KiCad projects integrated with GitHub and GitLab.

What is paplix?

When working on KiCad projects with a team, merging changes can be challenging. Unlike text files, binary KiCad files don't merge well with traditional Git tools. paplix solves this by:

  • Visualizing changes at the component level, not line-by-line
  • Detecting conflicts between your changes and your teammates' changes
  • Resolving conflicts by choosing which component changes to keep
  • Pushing resolved files back to your repository

Key Features

Visual Diff

See exactly what changed between two versions of a KiCad schematic or PCB:

  • Added, removed, or modified components
  • Moved or rotated parts
  • Changed traces and routing
  • Updated text and labels

Smart Conflict Resolution

When a merge conflict occurs, paplix analyzes the changes at the component level and lets you:

  • See conflicts per component, not per file
  • Choose "mine", "theirs", "both", or "neither" for each conflict
  • Preview the result before committing
  • Automatically reconstruct the resolved KiCad file

Git Integration

Works directly with your existing GitHub and GitLab repositories:

  • No changes to your workflow required
  • Automatic detection of KiCad files
  • Webhook-based notifications for new pull requests
  • Direct push of resolved files

Next Steps