3 ms·
> git clients won't know what to do with the conflicted files This seems kind of similar to pushing git files with conflicts with the git client? Maybe the Juj
by Aeolun 5y ago
> git clients won't know what to do with the conflicted files
This seems kind of similar to pushing git files with conflicts with the git client? Maybe the Jujutsu formatting is slightly different, but the concept is the same.
- martinvonz 5y agoThese are representations of conflicts that are stored as special files, they are not regular files with conflict markers in. If you look at the commit with regular `git`, you're going to see a weird file with some JSON in it.
- Aeolun 5y agoThat’s arguably better ;) thanks for the explanation.