[PR #1814] [MERGED] Feat CB-3030 conflict resolving #2791

New issue

Closed

opened 2026-03-07 21:10:46 +03:00 by kerem · 0 comments

kerem commented

2026-03-07 21:10:46 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/dbeaver/cloudbeaver/pull/1814
Author: @Wroud
Created: 7/10/2023
Status: ✅ Merged
Merged: 7/17/2023
Merged by: @Wroud

Base: devel ← Head: feat/cb-3030/conflict-resolving

📝 Commits (9)

faa973f CB-3030 feat: conflict resolving
38c1248 CB-3030 fix: display os specific key instead of mod
b0586cc CB-3030 fix: sql editor status
38a1817 Merge branch 'devel' into feat/cb-3030/conflict-resolving
15b2ead Merge remote-tracking branch 'origin/devel' into feat/cb-3030/conflict-resolving
d3b36a0 Merge branch 'feat/cb-3030/conflict-resolving' of https://github.com/dbeaver/cloudbeaver into feat/cb-3030/conflict-resolving
ae4df7a CB-3030 fix: styles and data validation
72501f0 Merge branch 'devel' into feat/cb-3030/conflict-resolving
db8d6c6 CB-3030 fix: sql editor styles

📊 Changes

60 files changed (+3540 additions, -3445 deletions)

View changed files

📝 webapp/packages/core-blocks/src/Containers/BASE_CONTAINERS_STYLES.ts (+1 -0)
📝 webapp/packages/core-blocks/src/Menu/MenuBarSmallItem.tsx (+4 -4)
📝 webapp/packages/core-localization/src/locales/en.ts (+1 -0)
📝 webapp/packages/core-localization/src/locales/it.ts (+1 -0)
📝 webapp/packages/core-localization/src/locales/ru.ts (+1 -0)
📝 webapp/packages/core-localization/src/locales/zh.ts (+1 -0)
📝 webapp/packages/core-view/package.json (+2 -2)
📝 webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_REDO.ts (+1 -2)
📝 webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_SAVE.ts (+1 -3)
📝 webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_UNDO.ts (+1 -2)
📝 webapp/packages/core-view/src/View/CaptureView.tsx (+23 -15)
➕ webapp/packages/core-view/src/View/parseHotkey.ts (+70 -0)
📝 webapp/packages/plugin-codemirror6/package.json (+20 -7)
📝 webapp/packages/plugin-codemirror6/src/Editor.tsx (+6 -6)
📝 webapp/packages/plugin-codemirror6/src/EditorLoader.tsx (+1 -1)
📝 webapp/packages/plugin-codemirror6/src/IReactCodemirrorProps.ts (+4 -3)
📝 webapp/packages/plugin-codemirror6/src/ReactCodemirror.tsx (+107 -47)
➕ webapp/packages/plugin-codemirror6/src/ReactCodemirrorContext.ts (+16 -0)
➕ webapp/packages/plugin-codemirror6/src/ReactCodemirrorPanel.tsx (+56 -0)
➖ webapp/packages/plugin-codemirror6/src/getDefaultExtensions.ts (+0 -81)

...and 40 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/dbeaver/cloudbeaver/pull/1814 **Author:** [@Wroud](https://github.com/Wroud) **Created:** 7/10/2023 **Status:** ✅ Merged **Merged:** 7/17/2023 **Merged by:** [@Wroud](https://github.com/Wroud) **Base:** `devel` ← **Head:** `feat/cb-3030/conflict-resolving` --- ### 📝 Commits (9) - [`faa973f`](https://github.com/dbeaver/cloudbeaver/commit/faa973fc836c2a9aaf39df3d5ad59144d604882f) CB-3030 feat: conflict resolving - [`38c1248`](https://github.com/dbeaver/cloudbeaver/commit/38c1248b00455ac3dd0ad7b3632b25e1d0ff4d83) CB-3030 fix: display os specific key instead of mod - [`b0586cc`](https://github.com/dbeaver/cloudbeaver/commit/b0586cc268d3cc2921a536fdfb3d0359631ac515) CB-3030 fix: sql editor status - [`38a1817`](https://github.com/dbeaver/cloudbeaver/commit/38a1817d86224f0247607ca264f820e03089cdd1) Merge branch 'devel' into feat/cb-3030/conflict-resolving - [`15b2ead`](https://github.com/dbeaver/cloudbeaver/commit/15b2ead314e5ec762f1f7782665231d36e6425c4) Merge remote-tracking branch 'origin/devel' into feat/cb-3030/conflict-resolving - [`d3b36a0`](https://github.com/dbeaver/cloudbeaver/commit/d3b36a0c1fbea8a41c60fa1669a8e3e1d61af93c) Merge branch 'feat/cb-3030/conflict-resolving' of https://github.com/dbeaver/cloudbeaver into feat/cb-3030/conflict-resolving - [`ae4df7a`](https://github.com/dbeaver/cloudbeaver/commit/ae4df7a6b36f609f840659d77465c802836cbd8e) CB-3030 fix: styles and data validation - [`72501f0`](https://github.com/dbeaver/cloudbeaver/commit/72501f0f3bd62571375dc020c5fbc036ed4aa62b) Merge branch 'devel' into feat/cb-3030/conflict-resolving - [`db8d6c6`](https://github.com/dbeaver/cloudbeaver/commit/db8d6c6b2e86e1b34bce0f2618a29e050b2b8686) CB-3030 fix: sql editor styles ### 📊 Changes **60 files changed** (+3540 additions, -3445 deletions) <details> <summary>View changed files</summary> 📝 `webapp/packages/core-blocks/src/Containers/BASE_CONTAINERS_STYLES.ts` (+1 -0) 📝 `webapp/packages/core-blocks/src/Menu/MenuBarSmallItem.tsx` (+4 -4) 📝 `webapp/packages/core-localization/src/locales/en.ts` (+1 -0) 📝 `webapp/packages/core-localization/src/locales/it.ts` (+1 -0) 📝 `webapp/packages/core-localization/src/locales/ru.ts` (+1 -0) 📝 `webapp/packages/core-localization/src/locales/zh.ts` (+1 -0) 📝 `webapp/packages/core-view/package.json` (+2 -2) 📝 `webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_REDO.ts` (+1 -2) 📝 `webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_SAVE.ts` (+1 -3) 📝 `webapp/packages/core-view/src/Action/KeyBinding/Bindings/KEY_BINDING_UNDO.ts` (+1 -2) 📝 `webapp/packages/core-view/src/View/CaptureView.tsx` (+23 -15) ➕ `webapp/packages/core-view/src/View/parseHotkey.ts` (+70 -0) 📝 `webapp/packages/plugin-codemirror6/package.json` (+20 -7) 📝 `webapp/packages/plugin-codemirror6/src/Editor.tsx` (+6 -6) 📝 `webapp/packages/plugin-codemirror6/src/EditorLoader.tsx` (+1 -1) 📝 `webapp/packages/plugin-codemirror6/src/IReactCodemirrorProps.ts` (+4 -3) 📝 `webapp/packages/plugin-codemirror6/src/ReactCodemirror.tsx` (+107 -47) ➕ `webapp/packages/plugin-codemirror6/src/ReactCodemirrorContext.ts` (+16 -0) ➕ `webapp/packages/plugin-codemirror6/src/ReactCodemirrorPanel.tsx` (+56 -0) ➖ `webapp/packages/plugin-codemirror6/src/getDefaultExtensions.ts` (+0 -81) _...and 40 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>