4 #include "merge-recursive.h"
12 * Whether the merge is clean; possible values:
14 * 0: not clean (merge conflicts)
15 * <0: operation aborted prematurely. (object database
16 * unreadable, disk full, etc.) Worktree may be left in an
17 * inconsistent state if operation failed near the end.
22 * Result of merge. If !clean, represents what would go in worktree
23 * (thus possibly including files containing conflict markers).
28 * Special messages and conflict notices for various paths
30 * This is a map of pathnames to strbufs. It contains various
31 * warning/conflict/notice messages (possibly multiple per path)
32 * that callers may want to use.
34 struct strmap
*path_messages
;
37 * Additional metadata used by merge_switch_to_result() or future calls
38 * to merge_incore_*(). Includes data needed to update the index (if
39 * !clean) and to print "CONFLICT" messages. Not for external use.
43 unsigned _properly_initialized
;
47 * rename-detecting three-way merge with recursive ancestor consolidation.
48 * working tree and index are untouched.
50 * merge_bases will be consumed (emptied) so make a copy if you need it.
52 * NOTE: empirically, the recursive algorithm will perform better if you
53 * pass the merge_bases in the order of oldest commit to the
56 * [1] https://lore.kernel.org/git/nycvar.QRO.7.76.6.1907252055500.21907@tvgsbejvaqbjf.bet/
57 * [2] commit 8918b0c9c2 ("merge-recur: try to merge older merge bases
60 void merge_incore_recursive(struct merge_options
*opt
,
61 struct commit_list
*merge_bases
,
64 struct merge_result
*result
);
67 * rename-detecting three-way merge, no recursion.
68 * working tree and index are untouched.
70 void merge_incore_nonrecursive(struct merge_options
*opt
,
71 struct tree
*merge_base
,
74 struct merge_result
*result
);
76 /* Update the working tree and index from head to result after incore merge */
77 void merge_switch_to_result(struct merge_options
*opt
,
79 struct merge_result
*result
,
80 int update_worktree_and_index
,
81 int display_update_msgs
);
83 /* Do needed cleanup when not calling merge_switch_to_result() */
84 void merge_finalize(struct merge_options
*opt
,
85 struct merge_result
*result
);