Skip to content

Commit 21453d8

Browse files
chore(stack): conflictResolutions for fork/changes (attempt 1)
1 parent 3cecb9d commit 21453d8

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

.github/pr-stack.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,12 @@
193193
"commit": "*",
194194
"path": "apps/web/src/components/ChatView.tsx",
195195
"strategy": "theirs"
196+
},
197+
{
198+
"branch": "fork/changes",
199+
"commit": "*",
200+
"path": ".github/workflows/ci.yml",
201+
"strategy": "theirs"
196202
}
197203
]
198204
}

0 commit comments

Comments
 (0)