Skip to content

Commit 0641c6c

Browse files
chore: Add rules for automatic rebasing
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
1 parent f50b429 commit 0641c6c

3 files changed

Lines changed: 24 additions & 0 deletions

File tree

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[
2+
{
3+
"from": "import { IConfigurationService } from '../../configuration/common/configuration.js';",
4+
"by": "import { IConfigurationService } from '../../configuration/common/configuration.js';\\\nimport { isLinux } from '../../../base/common/platform.js';"
5+
},
6+
{
7+
"from": "if (verificationStatus !== ExtensionSignatureVerificationCode.Success && verificationStatus !== ExtensionSignatureVerificationCode.NotSigned && verifySignature && this.environmentService.isBuilt) {",
8+
"by": "if (verificationStatus !== ExtensionSignatureVerificationCode.Success && verificationStatus !== ExtensionSignatureVerificationCode.NotSigned && verifySignature && this.environmentService.isBuilt && !isLinux) {"
9+
}
10+
]
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[
2+
{
3+
"from": "import { isNative, isWeb } from '../../../../base/common/platform.js';",
4+
"by": "import { isLinux, isNative, isWeb } from '../../../../base/common/platform.js';"
5+
},
6+
{
7+
"from": "\\\t\\\t\\\t\\\tincluded: isNative",
8+
"by": "\\\t\\\t\\\t\\\tincluded: isNative && !isLinux"
9+
}
10+
]

rebase.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,10 @@ resolve_conflicts() {
451451
apply_changes "$conflictingFile"
452452
elif [[ "$conflictingFile" == "code/test/integration/browser/src/index.ts" ]]; then
453453
apply_changes "$conflictingFile"
454+
elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts" ]]; then
455+
apply_changes "$conflictingFile"
456+
elif [[ "$conflictingFile" == "code/src/vs/platform/extensionManagement/node/extensionManagementService.ts" ]]; then
457+
apply_changes "$conflictingFile"
454458
else
455459
echo "$conflictingFile file cannot be automatically rebased. Aborting"
456460
exit 1

0 commit comments

Comments
 (0)