mirror of
https://github.com/jj-vcs/jj.git
synced 2025-12-23 06:01:01 +00:00
3fe784d50c
Currently, checking out a commit with conflicts in a colocated workspace causes many editors to show all existing files as added since they aren't present in the Git HEAD commit. Using the tree of the first side of the commit as a base tree and then adding the '.jjconflict-*' trees on top of it would cause any files identical to the first tree to show as unchanged, matching Git's conflict behavior. One potential downside to this change is that it becomes harder for a user to notice if they incorrectly check out a conflicted commit using `git switch`, since previously all of their files would've disappeared so it would be more difficult to ignore. However, I think this could be solved a different way, such as by adding a warning when snapshotting if '.jjconflict' files are detected. Keeping the files from the first tree also has the benefit that '.gitignore' files will still be present, meaning that when a user does `jj abandon` to recover, it won't delete their ignored files. Using 'JJ-CONFLICT-README' as the name for the readme file instead of 'README' makes it more clear that this file is related to the '.jjconflict-*' trees, since now the repo's actual README file might be present as well in the tree. |
||
|---|---|---|
| .. | ||
| benches | ||
| gen-protos | ||
| proc-macros | ||
| src | ||
| tests | ||
| testutils | ||
| Cargo.toml | ||
| LICENSE | ||