3 ms·
It shouldn't matter, under the hood the tree is the same for both. I don't know why jj would complain but git wouldn't, hm.
by stavros 1y ago
It shouldn't matter, under the hood the tree is the same for both. I don't know why jj would complain but git wouldn't, hm.
- arccy 1y agofor me, squash merges are enforced on github, and usually results in some weird / empty commits if i rebase a local stack after pulling in changes with part of the stack merged.
- wakamoleguy 1y agoIt’s also possible that I start my next task without remembering to create a new diff first. That might explain the conflict when the original commit becomes immutable?
- SAI_Peregrinus 1y agoI wonder if they've got files tracked by git-lfs. `jj` doesn't handle those yet.