From df2f38770820101d8d5b02b5d54ae2ac4f4d8188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D0=B9=D0=B3=D0=B0?= Date: Sat, 30 May 2026 12:01:25 +0000 Subject: [PATCH] resolve deleted files conflict --- .DS_Store | Bin .gitignore | 0 .stfolder/syncthing-folder-940f59.txt | 0 Untitled.canvas | 0 work/.DS_Store | Bin work/_index.md | 0 work/projects/executor-security-analysis.md | 0 work/projects/executor-skip-report.md | 0 work/projects/executor-v2-redesign.md | 0 work/projects/zulip-migration.md | 0 work/wiki/.DS_Store | Bin work/wiki/apple-browsers/_index.md | 0 .../wiki/apple-browsers/abn-experiment-framework.md | 0 work/wiki/apple-browsers/analytics-patterns.md | 0 work/wiki/apple-browsers/anti-patterns.md | 0 .../apple-browsers/app-lifecycle-state-machine.md | 0 work/wiki/apple-browsers/architecture.md | 0 .../apple-browsers/branch-naming-conventions.md | 0 .../browserserviceskit-integration.md | 0 work/wiki/apple-browsers/ci-pipeline.md | 0 work/wiki/apple-browsers/code-style.md | 0 .../design-system-designresourceskit.md | 0 work/wiki/apple-browsers/development-commands.md | 0 .../duckplayer-userscript-integration.md | 0 work/wiki/apple-browsers/duckplayer.md | 0 work/wiki/apple-browsers/feature-flags-addition.md | 0 work/wiki/apple-browsers/feature-flags.md | 0 work/wiki/apple-browsers/general.md | 0 work/wiki/apple-browsers/import-hygiene.md | 0 work/wiki/apple-browsers/instrumentation-facades.md | 0 work/wiki/apple-browsers/ios-architecture.md | 0 .../ios-tracker-blocking-implementation.md | 0 work/wiki/apple-browsers/logging-guidelines.md | 0 .../wiki/apple-browsers/macos-singletons-removal.md | 0 .../wiki/apple-browsers/macos-system-integration.md | 0 work/wiki/apple-browsers/macos-window-management.md | 0 .../wiki/apple-browsers/maestro-device-selection.md | 0 work/wiki/apple-browsers/network-quality-scoring.md | 0 .../apple-browsers/network-quality-test-config.md | 0 work/wiki/apple-browsers/network-quality-testing.md | 0 .../network-quality-variance-scoring.md | 0 .../wiki/apple-browsers/performance-optimization.md | 0 work/wiki/apple-browsers/pixel-definitions.md | 0 work/wiki/apple-browsers/pixels.md | 0 work/wiki/apple-browsers/privacy-security.md | 0 work/wiki/apple-browsers/project-structure.md | 0 work/wiki/apple-browsers/pull-request.md | 0 work/wiki/apple-browsers/securevault-guidelines.md | 0 work/wiki/apple-browsers/shared-packages.md | 0 .../apple-browsers/subscription-architecture.md | 0 work/wiki/apple-browsers/swiftui-advanced.md | 0 work/wiki/apple-browsers/swiftui-style.md | 0 work/wiki/apple-browsers/testing.md | 0 work/wiki/apple-browsers/ui-testing.md | 0 work/wiki/apple-browsers/user-defaults-storage.md | 0 work/wiki/apple-browsers/vm-ui-testing.md | 0 work/wiki/apple-browsers/webkit-browser.md | 0 57 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .DS_Store mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .stfolder/syncthing-folder-940f59.txt mode change 100644 => 100755 Untitled.canvas mode change 100644 => 100755 work/.DS_Store mode change 100644 => 100755 work/_index.md mode change 100644 => 100755 work/projects/executor-security-analysis.md mode change 100644 => 100755 work/projects/executor-skip-report.md mode change 100644 => 100755 work/projects/executor-v2-redesign.md mode change 100644 => 100755 work/projects/zulip-migration.md mode change 100644 => 100755 work/wiki/.DS_Store mode change 100644 => 100755 work/wiki/apple-browsers/_index.md mode change 100644 => 100755 work/wiki/apple-browsers/abn-experiment-framework.md mode change 100644 => 100755 work/wiki/apple-browsers/analytics-patterns.md mode change 100644 => 100755 work/wiki/apple-browsers/anti-patterns.md mode change 100644 => 100755 work/wiki/apple-browsers/app-lifecycle-state-machine.md mode change 100644 => 100755 work/wiki/apple-browsers/architecture.md mode change 100644 => 100755 work/wiki/apple-browsers/branch-naming-conventions.md mode change 100644 => 100755 work/wiki/apple-browsers/browserserviceskit-integration.md mode change 100644 => 100755 work/wiki/apple-browsers/ci-pipeline.md mode change 100644 => 100755 work/wiki/apple-browsers/code-style.md mode change 100644 => 100755 work/wiki/apple-browsers/design-system-designresourceskit.md mode change 100644 => 100755 work/wiki/apple-browsers/development-commands.md mode change 100644 => 100755 work/wiki/apple-browsers/duckplayer-userscript-integration.md mode change 100644 => 100755 work/wiki/apple-browsers/duckplayer.md mode change 100644 => 100755 work/wiki/apple-browsers/feature-flags-addition.md mode change 100644 => 100755 work/wiki/apple-browsers/feature-flags.md mode change 100644 => 100755 work/wiki/apple-browsers/general.md mode change 100644 => 100755 work/wiki/apple-browsers/import-hygiene.md mode change 100644 => 100755 work/wiki/apple-browsers/instrumentation-facades.md mode change 100644 => 100755 work/wiki/apple-browsers/ios-architecture.md mode change 100644 => 100755 work/wiki/apple-browsers/ios-tracker-blocking-implementation.md mode change 100644 => 100755 work/wiki/apple-browsers/logging-guidelines.md mode change 100644 => 100755 work/wiki/apple-browsers/macos-singletons-removal.md mode change 100644 => 100755 work/wiki/apple-browsers/macos-system-integration.md mode change 100644 => 100755 work/wiki/apple-browsers/macos-window-management.md mode change 100644 => 100755 work/wiki/apple-browsers/maestro-device-selection.md mode change 100644 => 100755 work/wiki/apple-browsers/network-quality-scoring.md mode change 100644 => 100755 work/wiki/apple-browsers/network-quality-test-config.md mode change 100644 => 100755 work/wiki/apple-browsers/network-quality-testing.md mode change 100644 => 100755 work/wiki/apple-browsers/network-quality-variance-scoring.md mode change 100644 => 100755 work/wiki/apple-browsers/performance-optimization.md mode change 100644 => 100755 work/wiki/apple-browsers/pixel-definitions.md mode change 100644 => 100755 work/wiki/apple-browsers/pixels.md mode change 100644 => 100755 work/wiki/apple-browsers/privacy-security.md mode change 100644 => 100755 work/wiki/apple-browsers/project-structure.md mode change 100644 => 100755 work/wiki/apple-browsers/pull-request.md mode change 100644 => 100755 work/wiki/apple-browsers/securevault-guidelines.md mode change 100644 => 100755 work/wiki/apple-browsers/shared-packages.md mode change 100644 => 100755 work/wiki/apple-browsers/subscription-architecture.md mode change 100644 => 100755 work/wiki/apple-browsers/swiftui-advanced.md mode change 100644 => 100755 work/wiki/apple-browsers/swiftui-style.md mode change 100644 => 100755 work/wiki/apple-browsers/testing.md mode change 100644 => 100755 work/wiki/apple-browsers/ui-testing.md mode change 100644 => 100755 work/wiki/apple-browsers/user-defaults-storage.md mode change 100644 => 100755 work/wiki/apple-browsers/vm-ui-testing.md mode change 100644 => 100755 work/wiki/apple-browsers/webkit-browser.md diff --git a/.DS_Store b/.DS_Store old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.stfolder/syncthing-folder-940f59.txt b/.stfolder/syncthing-folder-940f59.txt old mode 100644 new mode 100755 diff --git a/Untitled.canvas b/Untitled.canvas old mode 100644 new mode 100755 diff --git a/work/.DS_Store b/work/.DS_Store old mode 100644 new mode 100755 diff --git a/work/_index.md b/work/_index.md old mode 100644 new mode 100755 diff --git a/work/projects/executor-security-analysis.md b/work/projects/executor-security-analysis.md old mode 100644 new mode 100755 diff --git a/work/projects/executor-skip-report.md b/work/projects/executor-skip-report.md old mode 100644 new mode 100755 diff --git a/work/projects/executor-v2-redesign.md b/work/projects/executor-v2-redesign.md old mode 100644 new mode 100755 diff --git a/work/projects/zulip-migration.md b/work/projects/zulip-migration.md old mode 100644 new mode 100755 diff --git a/work/wiki/.DS_Store b/work/wiki/.DS_Store old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/_index.md b/work/wiki/apple-browsers/_index.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/abn-experiment-framework.md b/work/wiki/apple-browsers/abn-experiment-framework.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/analytics-patterns.md b/work/wiki/apple-browsers/analytics-patterns.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/anti-patterns.md b/work/wiki/apple-browsers/anti-patterns.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/app-lifecycle-state-machine.md b/work/wiki/apple-browsers/app-lifecycle-state-machine.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/architecture.md b/work/wiki/apple-browsers/architecture.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/branch-naming-conventions.md b/work/wiki/apple-browsers/branch-naming-conventions.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/browserserviceskit-integration.md b/work/wiki/apple-browsers/browserserviceskit-integration.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/ci-pipeline.md b/work/wiki/apple-browsers/ci-pipeline.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/code-style.md b/work/wiki/apple-browsers/code-style.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/design-system-designresourceskit.md b/work/wiki/apple-browsers/design-system-designresourceskit.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/development-commands.md b/work/wiki/apple-browsers/development-commands.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/duckplayer-userscript-integration.md b/work/wiki/apple-browsers/duckplayer-userscript-integration.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/duckplayer.md b/work/wiki/apple-browsers/duckplayer.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/feature-flags-addition.md b/work/wiki/apple-browsers/feature-flags-addition.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/feature-flags.md b/work/wiki/apple-browsers/feature-flags.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/general.md b/work/wiki/apple-browsers/general.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/import-hygiene.md b/work/wiki/apple-browsers/import-hygiene.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/instrumentation-facades.md b/work/wiki/apple-browsers/instrumentation-facades.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/ios-architecture.md b/work/wiki/apple-browsers/ios-architecture.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/ios-tracker-blocking-implementation.md b/work/wiki/apple-browsers/ios-tracker-blocking-implementation.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/logging-guidelines.md b/work/wiki/apple-browsers/logging-guidelines.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/macos-singletons-removal.md b/work/wiki/apple-browsers/macos-singletons-removal.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/macos-system-integration.md b/work/wiki/apple-browsers/macos-system-integration.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/macos-window-management.md b/work/wiki/apple-browsers/macos-window-management.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/maestro-device-selection.md b/work/wiki/apple-browsers/maestro-device-selection.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/network-quality-scoring.md b/work/wiki/apple-browsers/network-quality-scoring.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/network-quality-test-config.md b/work/wiki/apple-browsers/network-quality-test-config.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/network-quality-testing.md b/work/wiki/apple-browsers/network-quality-testing.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/network-quality-variance-scoring.md b/work/wiki/apple-browsers/network-quality-variance-scoring.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/performance-optimization.md b/work/wiki/apple-browsers/performance-optimization.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/pixel-definitions.md b/work/wiki/apple-browsers/pixel-definitions.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/pixels.md b/work/wiki/apple-browsers/pixels.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/privacy-security.md b/work/wiki/apple-browsers/privacy-security.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/project-structure.md b/work/wiki/apple-browsers/project-structure.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/pull-request.md b/work/wiki/apple-browsers/pull-request.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/securevault-guidelines.md b/work/wiki/apple-browsers/securevault-guidelines.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/shared-packages.md b/work/wiki/apple-browsers/shared-packages.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/subscription-architecture.md b/work/wiki/apple-browsers/subscription-architecture.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/swiftui-advanced.md b/work/wiki/apple-browsers/swiftui-advanced.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/swiftui-style.md b/work/wiki/apple-browsers/swiftui-style.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/testing.md b/work/wiki/apple-browsers/testing.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/ui-testing.md b/work/wiki/apple-browsers/ui-testing.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/user-defaults-storage.md b/work/wiki/apple-browsers/user-defaults-storage.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/vm-ui-testing.md b/work/wiki/apple-browsers/vm-ui-testing.md old mode 100644 new mode 100755 diff --git a/work/wiki/apple-browsers/webkit-browser.md b/work/wiki/apple-browsers/webkit-browser.md old mode 100644 new mode 100755