Git

Milestone

No milestone

Labels

Assignees

lukaas-007

Reviewers

Linked items

Loading…

Projects

Loading…
lukaas-007 commented

Summary

State the change and its purpose.

Tests

  • Relevant tests added or updated
  • Security-related coverage included

PR Checks

  • Migrations applied and schema updated
  • Measurement path defined if applicable
  • Self-review complete with clarifying comments
  • Follow-up issues created and assigned
  • Documentation updated
  • Reviewers notified
  • Team FYI posted if feature flags or similar are involved
  • UAT or hotfix flow considered
  • Mobile/small-screen check done for UI work

Issue Alignment

  • PR linked to Issue
  • Submodules updated appropriately
  • UAT instructions added if manual testing required
  • Documentation label and notes added if needed
  • Translation label added if needed
  • Deployment notes added if post-deploy actions exist
Merge Conflicts This pull request has merge conflicts that must be resolved before merging.
git checkout master && git pull && git checkout editor && git merge master
react-native/components/CodeEditor.jsx
react-native/components/code/CodePage.jsx
react-native/components/code/CommandPalette.jsx
react-native/components/code/EditorGroup.jsx
react-native/components/code/FileNode.jsx
react-native/components/code/FileTree.jsx
react-native/components/code/SearchSidebar.jsx
react-native/components/code/Tabs.jsx
react-native/components/code/Terminal.jsx
react-native/components/code/TerminalPanel.jsx
react-native/components/code/Toast.jsx
react-native/components/code/Welcome.jsx
react-native/components/code/editorState.js
react-native/components/code/fuzzy.js
react-native/components/code/keymap.js
react-native/components/code/lineDiff.js
react-native/components/code/ui.jsx
react-native/components/code/useFileTree.js
react-native/components/code/useProjectEvents.js
react-native/components/code/vendor.js
react-native/components/fileSystem.js
react-native/components/monacoTheme.js
react-native/package-lock.json
react-native/package.json
react-native/scripts/fileserver.mjs
react-native/scripts/fileserver/handlers/files.mjs
react-native/scripts/fileserver/handlers/git.mjs
react-native/scripts/fileserver/handlers/search.mjs
react-native/scripts/fileserver/handlers/state.mjs
react-native/scripts/fileserver/handlers/vendor.mjs
react-native/scripts/fileserver/http.mjs
react-native/scripts/fileserver/projectPaths.mjs
react-native/scripts/fileserver/router.mjs
react-native/scripts/fileserver/search/codeSearch.mjs
react-native/scripts/fileserver/search/fileSearch.mjs
react-native/scripts/lsp.mjs
react-native/scripts/stage-sidecar.sh
react-native/scripts/terminal.mjs
react-native/scripts/watcher.mjs
Insert▾