Martin von Zweigbergk 9d7ed54f8e git_backend: add a README to conflicted commits ...

When you use e.g. `git switch` to check out a conflicted commit,
you're going to end up with the `.jjconflicts-*` directories in your
working copy. It's probably not obvious what those mean. This patch
adds a README file to the root tree to try to explain to users what's
going on and how to recover.

The authoritative information about conflicts is stored in the
`jj:trees` commit header. The contents of conflicted commits is only
used for preventing GC. We can therefore add contents to the tree
without much consequence.

2024-04-22 06:22:54 -07:00

..

common

rebase: rewrite rebase_revision to use transform_descendants

2024-04-22 21:05:49 +08:00

cli-reference@.md.snap

Add short a -e alias for --edit to prev and next

2024-04-21 13:58:38 -04:00

runner.rs

Implement advance-branches for jj commit

2024-04-20 10:26:04 -04:00

test_abandon_command.rs

tree: flatten TreeMergeError into BackendError

2024-03-30 22:40:05 +09:00

test_advance_branches.rs

Implement advance-branches for jj new

2024-04-20 10:26:04 -04:00

test_alias.rs

cli: add "Hint: " or "Warning: " heading to almost all messages

2024-03-26 11:23:13 +09:00

test_branch_command.rs

cli: unblock "branch list --all-remotes" with name patterns

2024-04-03 08:59:29 +09:00

test_builtin_aliases.rs

cli: show timestamp in local timezone and without millis and offset

2024-03-20 07:54:08 -07:00

test_cat_command.rs

cli: migrate "cat" to matcher API, warn unmatched paths

2024-04-16 10:12:31 +09:00

test_checkout.rs

cli: add convenient methods to print hint or warning with default headings

2024-03-26 00:28:27 +09:00

test_chmod_command.rs

git_backend: add a README to conflicted commits

2024-04-22 06:22:54 -07:00

test_commit_command.rs

cli: add "Hint: " or "Warning: " heading to almost all messages

2024-03-26 11:23:13 +09:00

test_commit_template.rs

template: add method mine() to commit type

2024-04-04 22:47:34 +02:00

test_concurrent_operations.rs

op_store: add metadata flag for ops representing working-copy snapshot

2024-02-19 22:44:38 -08:00

test_config_command.rs

cli: add "Hint: " or "Warning: " heading to almost all messages

2024-03-26 11:23:13 +09:00

test_debug_command.rs

cli: add fileset utility functions and debug command

2024-04-09 20:42:09 +09:00

test_describe_command.rs

compile integration tests as a single binary

2024-02-06 18:19:41 -08:00

test_diff_command.rs

fileset: parse cwd/root-glob patterns

2024-04-18 11:09:54 +09:00

test_diffedit_command.rs

git_backend: add a README to conflicted commits

2024-04-22 06:22:54 -07:00

test_duplicate_command.rs

rebase: do not modify commit IDs if commit is unchanged after rebase

2024-03-29 15:22:50 +08:00

test_edit_command.rs

compile integration tests as a single binary

2024-02-06 18:19:41 -08:00

test_generate_md_cli_help.rs

docs, CLI reference: use include-markdown instead of a symlink

2024-02-12 10:28:09 -08:00

test_git_clone.rs

cli: rename --all to --all-remotes for branch list

2024-04-01 10:12:13 +09:00

test_git_colocated.rs

cli: rename --all to --all-remotes for branch list

2024-04-01 10:12:13 +09:00

test_git_fetch.rs

cli: rename --all to --all-remotes for branch list

2024-04-01 10:12:13 +09:00

test_git_import_export.rs

cli: rename --all to --all-remotes for branch list

2024-04-01 10:12:13 +09:00

test_git_init.rs

cli: rename --all to --all-remotes for branch list

2024-04-01 10:12:13 +09:00

test_git_push.rs

git_backend: add a README to conflicted commits

2024-04-22 06:22:54 -07:00

test_git_remotes.rs

compile integration tests as a single binary

2024-02-06 18:19:41 -08:00

test_git_submodule.rs

compile integration tests as a single binary

2024-02-06 18:19:41 -08:00

test_gitignores.rs

cli: add "Hint: " or "Warning: " heading to almost all messages

2024-03-26 11:23:13 +09:00

test_global_opts.rs

cli: suggest root:"<path>" if cwd-relative path is not in workspace

2024-04-19 09:35:47 +09:00

test_immutable_commits.rs

git_backend: add a README to conflicted commits

2024-04-22 06:22:54 -07:00

test_init_command.rs

cli: rename --all to --all-remotes for branch list

2024-04-01 10:12:13 +09:00

test_interdiff_command.rs

compile integration tests as a single binary

2024-02-06 18:19:41 -08:00

test_log_command.rs

Add template aliases with node symbol configs.

2024-04-15 22:21:31 +02:00

test_move_command.rs

cli: add convenient methods to print hint or warning with default headings

2024-03-26 00:28:27 +09:00

test_new_command.rs

cli: don't check duplicates in revisions prefixed with "all:"

2024-04-02 15:17:12 +09:00

test_next_prev_commands.rs

Make jj next work when the working copy is a merge commit

2024-04-08 14:52:11 -04:00

test_obslog_command.rs

git_backend: add a README to conflicted commits

2024-04-22 06:22:54 -07:00

test_operations.rs

Add template aliases with node symbol configs.

2024-04-15 22:21:31 +02:00

test_parallelize_command.rs

parallelize: make the command pass in more cases

2024-04-18 21:06:52 -07:00

test_rebase_command.rs

rebase: do not simplify ancestor merges

2024-04-22 21:05:49 +08:00

test_repo_change_report.rs

git_backend: add a README to conflicted commits

2024-04-22 06:22:54 -07:00

test_resolve_command.rs

git_backend: add a README to conflicted commits

2024-04-22 06:22:54 -07:00

test_restore_command.rs

git_backend: add a README to conflicted commits

2024-04-22 06:22:54 -07:00

test_revset_output.rs

revset: add support for file(kind:pattern) syntax

2024-04-07 19:43:29 +09:00

test_root.rs

compile integration tests as a single binary

2024-02-06 18:19:41 -08:00

test_shell_completion.rs

compile integration tests as a single binary

2024-02-06 18:19:41 -08:00

test_show_command.rs

Add template aliases with node symbol configs.

2024-04-15 22:21:31 +02:00

test_sparse_command.rs

sparse: extract "set --reset" to subcommand

2024-03-29 11:02:31 +09:00

test_split_command.rs

Rewrite rebasing in jj split using transform_descendants()

2024-04-21 12:21:39 -04:00

test_squash_command.rs

git_backend: add a README to conflicted commits

2024-04-22 06:22:54 -07:00

test_status_command.rs

cli: support filtering by paths in status

2024-04-05 20:41:44 +01:00

test_tag_command.rs

compile integration tests as a single binary

2024-02-06 18:19:41 -08:00

test_templater.rs

cli: label log/obslog template as "log"

2024-04-18 11:14:28 +09:00

test_tree_level_conflicts.rs

git_backend: add a README to conflicted commits

2024-04-22 06:22:54 -07:00

test_undo.rs

cli: rename --all to --all-remotes for branch list

2024-04-01 10:12:13 +09:00

test_unsquash_command.rs

description_utils: teach combine_messages() to handle more than two sources

2024-03-13 05:21:05 -07:00

test_untrack_command.rs

compile integration tests as a single binary

2024-02-06 18:19:41 -08:00

test_util_command.rs

op_store: add metadata flag for ops representing working-copy snapshot

2024-02-19 22:44:38 -08:00

test_working_copy.rs

cli: add another test for snapshot.max-new-file-size

2024-04-19 13:03:24 -05:00

test_workspaces.rs

git_backend: add a README to conflicted commits

2024-04-22 06:22:54 -07:00