api-merge

merge API =========

The merge API helps a program to reconcile two competing sets of improvements to some files (e.g., unregistered changes from the work tree versus changes involved in switching to a new branch), reporting conflicts if found. The library called through this API is responsible for a few things.

determining which trees to merge (recursive ancestor consolidation);

lining up corresponding files in the trees to be merged (rename detection, subtree shifting), reporting edge cases like add/add and rename/rename conflicts to the user;

performing a three-way merge of corresponding files, taking path-specific merge drivers (specified in .gitattributes) into account.

Data structures ---------------

mmfile_t

This stores a buffer and its size for input to or output from the xdiff backend. See xdiff/xdiff.h for the definition and diff.c for examples.

struct ll_merge_options

Check merge-ll.h for details.

Low-level (single file) merge -----------------------------

Check merge-ll.h for details.

这篇文档对你有帮助吗？

1.5.0.1

1.5.0.2

1.5.0.3

1.5.0.4

1.5.0.5

1.5.0.6

1.5.0.7

1.5.0

1.5.1.1

1.5.1.2

1.5.1.3

1.5.1.4

1.5.1.5

1.5.1.6

1.5.1

1.5.2.1

1.5.2.2

1.5.2.3

1.5.2.4

1.5.2.5

1.5.2

1.5.3.1

1.5.3.2

1.5.3.3

1.5.3.4

1.5.3.5

1.5.3.6

1.5.3.7

1.5.3.8

1.5.3

1.5.4.1

1.5.4.2

1.5.4.3

1.5.4.4

1.5.4.5

1.5.4.6

1.5.4.7

1.5.4

1.5.5.1

1.5.5.2

1.5.5.3

1.5.5.4

1.5.5.5

1.5.5.6

1.5.5

1.5.6.1

1.5.6.2

1.5.6.3

1.5.6.4

1.5.6.5

1.5.6.6

1.5.6

1.6.0.1

1.6.0.2

1.6.0.3

1.6.0.4

1.6.0.5

1.6.0.6

1.6.0

1.6.1.1

1.6.1.2

1.6.1.3

1.6.1.4

1.6.1

1.6.2.1

1.6.2.2

1.6.2.3

1.6.2.4

1.6.2.5

1.6.2

1.6.3.1

1.6.3.2

1.6.3.3

1.6.3.4

1.6.3

1.6.4.1

1.6.4.2

1.6.4.3

1.6.4.4

1.6.4.5