3 ms·
That's really odd, maybe the tree is somehow messed up? I've never had this problem. What's conflicting? Can you try it on a fresh clone and see if it still ha
by stavros 1y ago
That's really odd, maybe the tree is somehow messed up? I've never had this problem. What's conflicting?
Can you try it on a fresh clone and see if it still happens?
- wakamoleguy 1y agoMaybe it’s based on whether the GitHub merge is a squash, rebase, or plain merge? Or do folks usually manually perform the merge with jj?
- stavros 1y agoIt 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.