Written to: 1 requirement: 1 proved, 0 partly, 0 failing, 0 with no test recorded. 0003-repoctl-sync FR-005
repoctl merge <ref> (commons repoctl 0003-repoctl-syncFR-005, FR-006): Git merges the reference; where files conflict, the ones a generator writes are never resolved by hand but made again by their generators (taking one side to clear the markers, running sync, and staging what is then as its generator makes it), and the ones a person wrote are left exactly as Git left them and named. The merge is completed only where nothing conflicts any more.
typeMergeReport=| { readonlykind:"refused"; readonlywhy:readonlystring[] }
| { readonlykind:"merged"; readonlysync:SyncReport }
| {
readonlykind:"conflicts";
/** The generated files that conflicted and were made again and staged. */readonlyregenerated:readonlystring[];
/** Of those, the ones that also hold what a person wrote: the lines of both sides were kept and the generated part was made again, so that nothing a side wrote is lost. */readonlyunioned:readonlystring[];
/** The generated files that conflicted and could not be made again: they stay conflicted. */readonlyunresolved:readonlystring[];
/** The files a person wrote that conflict, untouched. */readonlywritten:readonlystring[];
/** Whether the merge was completed with a commit. */readonlycommitted:boolean;
readonlysync:SyncReport;
};
typeMergeReport=| { readonlykind:"refused"; readonlywhy:readonlystring[] }
| { readonlykind:"merged"; readonlysync:SyncReport }
| {
readonlykind:"conflicts";
/** The generated files that conflicted and were made again and staged. */readonlyregenerated:readonlystring[];
/** Of those, the ones that also hold what a person wrote: the lines of both sides were kept and the generated part was made again, so that nothing a side wrote is lost. */readonlyunioned:readonlystring[];
/** The generated files that conflicted and could not be made again: they stay conflicted. */readonlyunresolved:readonlystring[];
/** The files a person wrote that conflict, untouched. */readonlywritten:readonlystring[];
/** Whether the merge was completed with a commit. */readonlycommitted:boolean;
readonlysync:SyncReport;
};