Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

Conflict resolution is one of my least favorite parts of Git but I don't complain because there ain't no such thing as free lunch. Does Pijul reduce the number of conflicts that would otherwise be faced by a Git VCS? And if so, to what extent?


Yes it does, because Pijul has an internal model of conflicts. In particular, conflicts happen between two patches, and are solved by a patch.

This means for example that when you solve a conflict on a branch, and pull from the same remote, the conflict won't reappear (no `git rerere` needed).

Or that you can push a conflict resolution to a remote, even if that remote is in another state: as long as the remote has the conflicting patches, the resolution will work.




Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: