Skip to content

Commit fed2326

Browse files
Add rebase rule for code/build/gulpfile.compile.ts
Preserve the Che-specific change that disables name mangling in the CI build task (makeCompileBuildTask(true) instead of false). Made-with: Cursor
1 parent cf1ba33 commit fed2326

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": "export const compileBuildWithManglingTask = task.define('compile-build-with-mangling', task.series(compilation.copyCodiconsTask, makeCompileBuildTask(false)));",
4+
"by": "export const compileBuildWithManglingTask = task.define('compile-build-with-mangling', task.series(compilation.copyCodiconsTask, makeCompileBuildTask(true)));"
5+
}
6+
]

rebase.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,8 @@ resolve_conflicts() {
443443
apply_package_changes_by_path "$conflictingFile"
444444
elif [[ "$conflictingFile" == "code/build/gulpfile.cli.ts" ]]; then
445445
apply_changes_multi_line "$conflictingFile"
446+
elif [[ "$conflictingFile" == "code/build/gulpfile.compile.ts" ]]; then
447+
apply_changes_multi_line "$conflictingFile"
446448
elif [[ "$conflictingFile" == "code/build/gulpfile.reh.ts" ]]; then
447449
apply_changes_multi_line "$conflictingFile"
448450
elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts" ]]; then

0 commit comments

Comments
 (0)