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
31 lines (30 loc) • 987 B
TypeScript
import Component from '../../component/consumer-component';
import Consumer from '../../consumer';
import { SourceFile } from '../../component/sources';
import { PathLinux } from '../../../utils/path';
export declare type MergeResultsTwoWay = {
addFiles: Array<{
filePath: PathLinux;
otherFile: SourceFile;
}>;
modifiedFiles: Array<{
filePath: PathLinux;
otherFile: SourceFile;
currentFile: SourceFile;
output: string | null | undefined;
conflict: string | null | undefined;
}>;
unModifiedFiles: Array<{
filePath: PathLinux;
currentFile: SourceFile;
}>;
hasConflicts: boolean;
};
declare const _default: ({ consumer, otherComponent, otherVersion, currentComponent, currentVersion }: {
consumer: Consumer;
otherComponent: Component;
otherVersion: string;
currentComponent: Component;
currentVersion: string;
}) => Promise<MergeResultsTwoWay>;
export default _default;