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 ...