Skip to content

Commit 3259730

Browse files
author
hack-cli-tests
committed
Fix Linear project conflict fallback
1 parent a64d91f commit 3259730

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

src/control-plane/extensions/linear/commands.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4245,6 +4245,10 @@ function detectAuthoritativeFieldConflicts(input: {
42454245
const conflicts: RecordedSyncConflict[] = [];
42464246
const authorityLabel =
42474247
input.authority === "review_required" ? "review-required" : input.authority;
4248+
const localLinearRemote = findTicketRemoteLink({
4249+
ticket: input.ticket,
4250+
provider: "linear",
4251+
});
42484252
const localTitle = input.ticket.title.trim();
42494253
const remoteTitle = input.issue.title.trim();
42504254
if (localTitle !== remoteTitle) {
@@ -4284,8 +4288,8 @@ function detectAuthoritativeFieldConflicts(input: {
42844288
}
42854289

42864290
const localProject = normalizeProjectValue({
4287-
projectId: input.ticket.projectId,
4288-
projectName: input.ticket.projectName,
4291+
projectId: input.ticket.projectId ?? localLinearRemote?.projectId,
4292+
projectName: input.ticket.projectName ?? localLinearRemote?.projectName,
42894293
});
42904294
const remoteProject = normalizeProjectValue({
42914295
projectId: input.issue.projectId,

0 commit comments

Comments
 (0)