forked from mirrors/jj
70b517ca64
For example, ``` <<<<<<< Conflict 1 of 3 +++++++ Contents of side #1 left 3.1 left 3.2 left 3.3 %%%%%%% Changes from base to side #2 -line 3 +right 3.1 >>>>>>> ``` or ``` <<<<<<< Conflict 1 of 1 %%%%%%% Changes from base to side #1 -line 3 +right 3.1 +++++++ Contents of side #2 left 3.1 left 3.2 left 3.3 >>>>>>> ``` Currently, there is no way to disable these, this is TODO for a future PR. Other TODOs for future PRs: make these labels configurable. After that, we could support a `diff3/git`-like conflict format as well, in principle. Counting conflicts helps with knowing whether you fixed all the conflicts while you are in the editor. While labeling "side #1", etc, does not tell you the commit id or description as requested in #1176, I still think it's an improvement. Most importantly, I hope this will make `jj`'s conflict format less scary-looking for new users. I've used this for a bit, and I like it. Without the labels, I would see that the two conflicts have a different order of conflict markers, but I wouldn't be able to remember what that means. For longer diffs, it can be tricky for me to quickly tell that it's a diff as opposed to one of the sides. This also creates some hope of being able to navigate a conflict with more than 2 sides. Another not-so-secret goal for this is explained in https://github.com/martinvonz/jj/pull/3109#issuecomment-2014140627. The idea is a little weird, but I *think* it could be helpful, and I'd like to experiment with it. |
||
|---|---|---|
| .. | ||
| runner.rs | ||
| test_bad_locking.rs | ||
| test_commit_builder.rs | ||
| test_commit_concurrent.rs | ||
| test_conflicts.rs | ||
| test_default_revset_graph_iterator.rs | ||
| test_diff_summary.rs | ||
| test_git.rs | ||
| test_git_backend.rs | ||
| test_gpg.rs | ||
| test_id_prefix.rs | ||
| test_index.rs | ||
| test_init.rs | ||
| test_load_repo.rs | ||
| test_local_working_copy.rs | ||
| test_local_working_copy_concurrent.rs | ||
| test_local_working_copy_sparse.rs | ||
| test_merge_trees.rs | ||
| test_merged_tree.rs | ||
| test_mut_repo.rs | ||
| test_operations.rs | ||
| test_refs.rs | ||
| test_revset.rs | ||
| test_rewrite.rs | ||
| test_rewrite_transform.rs | ||
| test_signing.rs | ||
| test_ssh_signing.rs | ||
| test_view.rs | ||
| test_workspace.rs | ||