Code

feat: optimize merge conflict#3585

Code

Merged

erha19 merged 31 commits intomainopensumi/core:mainfrom feat/update-merge-conflictopensumi/core:feat/update-merge-conflictCopy head branch name to clipboardApr 30, 2024

+1,565-842

Commits

Commits on Apr 16, 2024

• chore: update en translation

  bytemain

  committed
  4578906

  Copy full SHA for 4578906

• feat: optimize merge

  bytemain

  committed
  8938ccb

  Copy full SHA for 8938ccb

• refactor: update code

  bytemain

  committed
  06d6e1c

  Copy full SHA for 06d6e1c

• chore: use menubar view

  bytemain

  committed
  2ad7546

  Copy full SHA for 2ad7546

• feat: use lru map in conflict parser

  bytemain

  committed
  ed3cdb6

  Copy full SHA for ed3cdb6

• refactor: update code

  bytemain

  committed
  fa1ba8c

  Copy full SHA for fa1ba8c

• refactor: update code

  bytemain

  committed
  1b71ba0

  Copy full SHA for 1b71ba0

• feat: show conflict info

  bytemain

  committed
  bb11496

  Copy full SHA for bb11496

Commits on Apr 17, 2024

• chore: update code

  bytemain

  committed
  0130ff3

  Copy full SHA for 0130ff3

Commits on Apr 22, 2024

• Merge remote-tracking branch 'origin/main' into feat/update-merge-conflict

  bytemain

  committed
  bbc2914

  Copy full SHA for bbc2914

Commits on Apr 28, 2024

• feat: show merge info for 3way

  bytemain

  committed
  13ed001

  Copy full SHA for 13ed001

• fix: accept left or right is broken

  bytemain

  committed
  416c7df

  Copy full SHA for 416c7df

• chore: update code

  bytemain

  committed
  ac82c28

  Copy full SHA for ac82c28

• fix: fix reset not work

  bytemain

  committed
  039b752

  Copy full SHA for 039b752

• chore: update code

  bytemain

  committed
  9fe3480

  Copy full SHA for 9fe3480

• chore: update code

  bytemain

  committed
  7c88a37

  Copy full SHA for 7c88a37

Commits on Apr 29, 2024

• feat: show inline diff in merge conflicts

  bytemain

  committed
  cd36f71

  Copy full SHA for cd36f71

• feat: support auto stage

  bytemain

  committed
  5edc5e0

  Copy full SHA for 5edc5e0

Commits on Apr 30, 2024

• feat: support show diff

  bytemain

  committed
  bd0d255

  Copy full SHA for bd0d255

• feat: implement diff

  bytemain

  committed
  a3adb61

  Copy full SHA for a3adb61

• feat: optimize ui string

  bytemain

  committed
  b141e44

  Copy full SHA for b141e44

• Merge remote-tracking branch 'origin/main' into feat/update-merge-conflict

  bytemain

  committed
  17e8115

  Copy full SHA for 17e8115

• build: fix build

  bytemain

  committed
  2add7f0

  Copy full SHA for 2add7f0

• chore: fix build script

  bytemain

  committed
  c027d67

  Copy full SHA for c027d67

• fix: decoration is not correct

  bytemain

  committed
  8ad834f

  Copy full SHA for 8ad834f

• fix: compatible with popover

  bytemain

  committed
  577459e

  Copy full SHA for 577459e

• fix: context key

  bytemain

  committed
  f63e97e

  Copy full SHA for f63e97e

• feat: add i18n

  bytemain

  committed
  fec3bd7

  Copy full SHA for fec3bd7

• Merge branch 'main' into feat/update-merge-conflict

  bytemain

  authored
  cded799

  Copy full SHA for cded799

• chore: add missing i18n

  bytemain

  committed
  69a4ab8

  Copy full SHA for 69a4ab8

• Merge branch 'main' into feat/update-merge-conflict

  bytemain

  authored
  a6fdb82

  Copy full SHA for a6fdb82