3 ms·

Pijul eliminates the rift between rebases and merges. That in itself is an enormous gain over the confused git workflow or lack thereof.

• 1oooqooq 3y ago
  And what is it? couldn't find on the "doc"... is it all rebases or all merges?
  • baq 3y ago
    More like merges but actually neither… it can reorder patches, even conflicting ones, it’s a completely foreign concept in git.
    • 1oooqooq 3y ago
      sounds like rebase with force push remote. (well, every push is a force push in git. so just rebase+push. ...except on github if you have "protected branches")
      • baq 3y ago
        Not really, no; ordering of patches is not something you as a developer should care about. It’s behind the scenes. No force pushes necessary.
        • 1oooqooq 3y ago
          thanks. i will have to try it out. but it does sound like "rewriting history" in git et al.
          • baq 3y ago
            The point is there is no single history in the git sense - there are patches which commute, but their order is... irrelevant (if possible).
  • vlowther 3y ago
    That is a distinction that only exists because a Git repo is an ordered sequence of snapshots of your code that get translated to and from patches for human consumption. As far as I can tell, a Pijul repo is more of a giant dependency graph of patches that when merged together form a consistent snapshot of your code.
• ParetoOptimal 3y ago
  Most won't understand the gravity of this without a concrete example.