4 ms·
If the Pijul feature you care most about is "first-class conflicts", you may want to check out my VCS: https://github.com/martinvonz/jj https://github.com/marti
by martinvonz 5y ago
If the Pijul feature you care most about is "first-class conflicts", you may want to check out my VCS: https://github.com/martinvonz/jj https://github.com/martinvonz/jj. It has git interop.
- IshKebab 5y agoThat looks very cool, and very wise to use git as the actual storage system. Means you have a chance of people actually using it. I have one question: how do changes to files in the working copy automatically update the current commit hash? Do you just calculate it on demand, and then actually make the commit when some command would move to different commit (`jj switch someotherbranch` or whatever)?
- martinvonz 5y agoAny command that depends on the working copy commit will first check if it needs to create a new commit from the working copy contents. So when you run e.g. `jj status`, it will amend the current working copy commit if there are changes. In case you're thinking that that seems slow, it's not really significant at least up to git.git scale. For larger repos, I plan to rely on something like watchman.
- kadoban 5y agoThanks, I'll check it out. Yeah, that's the main draw for me.