git_policy_cli/merge/
mod.rs

1//! What:
2//!  Merges:
3//!  the word-level second pass,
4//!  isolated merges and pull handling.
5//! Why:
6//!  Merge code shares fixtures and a journal,
7//!  so it is kept together.
8//!
9//! In TS you'd write (pseudocode):
10//! ```ts
11//! // merge/index.ts: one `export * from './file'` per module below.
12//! ```
13
14/// The three-way merge by line and by word that resolves a conflict Git's line merge reports.
15pub mod word_merge;
16
17/// The conflicted files a merge left, which of them the word pass may re-merge, and the lines that list each merged part.
18pub mod merge_second_pass;
19
20/// The word-level second pass for merges computed from objects, and the attribute tree those merges read.
21pub mod merge_second_pass_tree;
22
23/// The word-level second pass after a forwarded merge, rebase, cherry-pick or revert that Git stopped with a conflict.
24pub mod merge_second_pass_worktree;
25
26/// The finish of a stopped operation, like a clean run, after the second pass resolved every conflicted file.
27pub mod merge_second_pass_finish;
28
29/// The `git merge` command lines the wrapper completes in isolation, and those it leaves to native Git.
30pub mod merge_options;
31
32/// The settling of an isolated merge whose branch moved while it was prepared or applied.
33pub mod merge_isolation_moved;
34
35/// The durable intent record of an isolated merge.
36pub mod merge_isolation_journal;
37
38/// The raw differences of an isolated merge and the worktree state of each changed path.
39pub mod merge_isolation_changes;
40
41/// Recovery of an isolated merge whose process died.
42pub mod merge_isolation_recovery;
43
44/// The commit message of an isolated merge.
45pub mod merge_isolation_message;
46
47/// A pull that merges, read as its fetch and its merge of `FETCH_HEAD`.
48pub mod pull_isolation;
49
50/// The refusal findings of an isolated merge.
51pub mod merge_isolation_report;
52
53/// A true merge completed in isolation while the index holds staged changes.
54pub mod merge_isolation;
git_policy_cli/merge/mod.rs

git_policy_cli/merge/
mod.rs
