~?~

~?~

~?~

Home Blog Documentation Downloads FAQ Roadmap Pijul Simple, distributed, fast. Pick any three. A version control system is a piece of software that allows different authors to work collaboratively and asynchronously on a file, keeps track of their changes and alerts them when their edits are conflicting. It can also be used by single authors to review and revert their changes. It is distinct from a parallel editor, in which all authors edit the same file concurrently. In a parallel editor, the authors are forced to share all their edits with others, often restricting their creativity and causing data loss. There are basically two approaches to version control: either snapshot-based (git, mercurial, svn or their ancestors), or patch-based ( darcs ). Historically, patch-based systems have been very simple to learn and use, but slow, whereas snapshot-based syst...

Login Logout Login / Get an account Logout view edit history discuss Theory Background: other solutions The file lock model The first distributed solution: emails Three-way merge Patch commutation Pijul’s new idea Filesets and Patches Merges and Pushouts Concretely, in Pijul Conflicted Files and Rendering Anatomy of a Repository Advanced Topics Line identifiers Darcs’ patch theory is centered around patches, with two primitive operations, commutation and inversion . Compared to this, pijul’s theory revolves around files (i.e., states of the working directory at a given point in time) as well as patches, with a merge operation between patches. In contrast with git, this merge operation is well-defined and has all expected properties: in technical terms, it is a pushout in a category where files are the objects, and patches are the arrows. As a consequence of this, to ...

~?~