Skip to content

Commit 6d4c807

Browse files
chore: Provide rule for automatic rebasing against upstream
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
1 parent 3815568 commit 6d4c807

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[
2+
{
3+
"from": "this.preferPreReleases = this.productService.quality !== 'stable';",
4+
"by": "this.preferPreReleases = false;"
5+
}
6+
]

rebase.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,8 @@ resolve_conflicts() {
482482
apply_changes "$conflictingFile"
483483
elif [[ "$conflictingFile" == "code/src/vs/platform/extensionManagement/node/extensionManagementService.ts" ]]; then
484484
apply_changes "$conflictingFile"
485+
elif [[ "$conflictingFile" == "code/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts" ]]; then
486+
apply_changes "$conflictingFile"
485487
elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts" ]]; then
486488
apply_multi_line_replace "$conflictingFile"
487489
else

0 commit comments

Comments
 (0)