bit-bin
Version:
<a href="https://opensource.org/licenses/Apache-2.0"><img alt="apache" src="https://img.shields.io/badge/License-Apache%202.0-blue.svg"></a> <a href="https://github.com/teambit/bit/blob/master/CONTRIBUTING.md"><img alt="prs" src="https://img.shields.io/b
39 lines (38 loc) • 1.24 kB
TypeScript
import Component from '../../component';
import { Consumer } from '../..';
import { SourceFile } from '../../component/sources';
import { PathLinux } from '../../../utils/path';
import { Version } from '../../../scope/models';
import { SourceFileModel } from '../../../scope/models/version';
export declare type MergeResultsThreeWay = {
addFiles: Array<{
filePath: PathLinux;
fsFile: SourceFile;
}>;
modifiedFiles: Array<{
filePath: PathLinux;
fsFile: SourceFile;
baseFile: SourceFileModel;
currentFile: SourceFileModel;
output: string | null | undefined;
conflict: string | null | undefined;
}>;
unModifiedFiles: Array<{
filePath: PathLinux;
fsFile: SourceFile;
}>;
overrideFiles: Array<{
filePath: PathLinux;
fsFile: SourceFile;
}>;
hasConflicts: boolean;
};
declare const _default: ({ consumer, otherComponent, otherVersion, currentComponent, currentVersion, baseComponent }: {
consumer: Consumer;
otherComponent: Component;
otherVersion: string;
currentComponent: Version;
currentVersion: string;
baseComponent: Version;
}) => Promise<MergeResultsThreeWay>;
export default _default;