3 ms·
Since pijul's key advertised strength is the use of patches for resolving merges, couldn't this just be a new merge strategy option for `git merge -s <strategy>
by ojosilva 8y ago
Since pijul's key advertised strength is the use of patches for resolving merges, couldn't this just be a new merge strategy option for `git merge -s <strategy>`? In this case, the algorithm would just produce temporary patches out of git snapshots before running its own algo. Even if it comes out being slower than natively storing patches it would be worth the cost if it made complicated merges easier.
- chrismorgan 8y agohttps://pijul.com/faq/#why-not-a-git-merge-algorithm-instead-of-a-whole-vcs https://pijul.com/faq/#why-not-a-git-merge-algorithm-instead...