3 ms·
As sibling mentioned, this is totally solved by git-rerere.
by semiquaver 4y ago
As sibling mentioned, this is totally solved by git-rerere.
- booleandilemma 4y agoWhen can we move to Sapling again?
- Shish2k 4y agoI already have - it’s pretty great :D
- IshKebab 4y agoHow would Sapling avoid this? As I understand it it uses the same data model as Mercurial which is really the same as Git's. I think you would need something like Pijul to solve it nicely. At least as far as I can tell. I might actually try this in Pijul because I too encounter this semi-regularly (it's not a freak occurrence at all) and my solution is basically to give up and squash my branch before rebasing.
- BiteCode_dev 4y agoPartially. Unfortunatly, rerere is not perfect, and will only solve 80% of the cases. For big rebase, this can add up to a lot, which I just paid the price last week.