Skip to content

Commit 1e3e8ce

Browse files
authored
Don't use crypto package (#5962)
1 parent 45bbc4e commit 1e3e8ce

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/github/conflictResolutionModel.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { randomUUID } from 'crypto';
76
import * as vscode from 'vscode';
87
import { Schemes, toGitHubUri } from '../common/uri';
98

@@ -27,7 +26,7 @@ export class ConflictResolutionModel {
2726
private readonly _resolvedConflicts: Map<string, ResolvedConflict> = new Map();
2827
private readonly _onAddedResolution: vscode.EventEmitter<void> = new vscode.EventEmitter<void>();
2928
public readonly onAddedResolution: vscode.Event<void> = this._onAddedResolution.event;
30-
public readonly mergeScheme = `${Schemes.MergeOutput}-${randomUUID()}`;
29+
public readonly mergeScheme = `${Schemes.MergeOutput}-${new Date().getTime()}`;
3130

3231
constructor(public readonly startingConflicts: Conflict[], public readonly repositoryName: string, public readonly prBaseOwner: string,
3332
public readonly latestPrBaseSha: string,

0 commit comments

Comments
 (0)