Show patches with: Series = merge-ort: add more handling of basic conflict types       |    Archived = No       |   10 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[10/10] merge-ort: add handling for different types of files at same path merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[09/10] merge-ort: copy find_first_merges() implementation from merge-recursive.c merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[08/10] merge-ort: implement format_commit() merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[07/10] merge-ort: copy and adapt merge_submodule() from merge-recursive.c merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[06/10] merge-ort: copy and adapt merge_3way() from merge-recursive.c merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[05/10] merge-ort: flesh out implementation of handle_content_merge() merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[04/10] merge-ort: handle book-keeping around two- and three-way content merge merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[03/10] merge-ort: implement unique_path() helper merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[02/10] merge-ort: handle directory/file conflicts that remain merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[01/10] merge-ort: handle D/F conflict where directory disappears due to merge merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded