Commits

Breadcrumbs

History for

ondevelop

User selector

All users

All time

Commit History

Commits on Feb 3, 2026

• feature: show `MINE` and `THEIRS` revision in merge conflict editor

  Show description for 1d80d00
  love-linger

  committed
  1d80d00

  Copy full SHA for 1d80d00

Commits on Feb 2, 2026

• code_style: simplify code about conflicts

  Show description for 5eaa71f
  love-linger

  committed
  5eaa71f

  Copy full SHA for 5eaa71f

Commits on Jan 28, 2026

• code_review: PR #2070

  Show description for 7c2053a
  love-linger

  committed
  7c2053a

  Copy full SHA for 7c2053a

Commits on Jan 27, 2026

• code_review: PR #2070

  Show description for ea9517e
  love-linger

  committed
  ea9517e

  Copy full SHA for ea9517e

• feature: built-in merge conflict solver (#2070)

  Show description for e5a5fad
  IacopoSb

  authored
  e5a5fad

  Copy full SHA for e5a5fad

Commits on Aug 12, 2025

• fix: main thread deadlock cause by calling `.Result` directly (#1720)

  Show description for bd81ccd
  love-linger

  committed
  bd81ccd

  Copy full SHA for bd81ccd

Commits on Jul 23, 2025

• refactor: move context menu creation from `ViewModels` to `Views` (PART 10)

  Show description for 6b9ba59
  love-linger

  committed
  6b9ba59

  Copy full SHA for 6b9ba59

Commits on Jul 7, 2025

• enhance: open external tool to merge conflicts instead of viewing diff

  Show description for 8277d7f
  love-linger

  committed
  8277d7f

  Copy full SHA for 8277d7f

Commits on Jul 5, 2025

• code_style: general cleanup (#1525)

  NathanBaulch

  authored
  3583527

  Copy full SHA for 3583527

Commits on Jul 3, 2025

• code_review: PR #1492

  Show description for 4076582
  love-linger

  committed
  4076582

  Copy full SHA for 4076582

Commits on May 30, 2025

• ux: show conflict short format in changes view

  Show description for 75015d5
  love-linger

  committed
  75015d5

  Copy full SHA for 75015d5

Commits on May 28, 2025

• code_style: run `dotnet format`

  Show description for 46231a7
  love-linger

  committed
  46231a7

  Copy full SHA for 46231a7

• feature: show conflict reason

  Show description for fbc8edc
  love-linger

  committed
  fbc8edc

  Copy full SHA for fbc8edc

Commits on May 24, 2025

• refactor: use a new `Models.ChangeState.Conflicted` to represent all the `unmerged` file state (#1359)

  Show description for ef53dd0
  love-linger

  committed
  ef53dd0

  Copy full SHA for ef53dd0

• fix: IsConflictResolved check should not be done for submodules (#1356)

  Show description for f3fe90b
  goran-w

  authored
  f3fe90b

  Copy full SHA for f3fe90b

Commits on Apr 17, 2025

• feature: git command logs

  Show description for 8b39df3
  love-linger

  committed
  8b39df3

  Copy full SHA for 8b39df3

Commits on Mar 10, 2025

• enhance: show commit info tip when hover SHA in conflict view

  Show description for b4fbc23
  love-linger

  committed
  b4fbc23

  Copy full SHA for b4fbc23

• ux: show conflict sources when it comes from a stash or patch (#1067)

  Show description for 8554666
  love-linger

  committed
  8554666

  Copy full SHA for 8554666

Commits on Mar 7, 2025

• enhance: supports to navigate to target commit while resolving conflicts

  Show description for 83f2358
  love-linger

  committed
  83f2358

  Copy full SHA for 83f2358

Commits on Dec 11, 2024

• refactor: re-design conflict panel

  love-linger

  committed
  dcaeaef

  Copy full SHA for dcaeaef

Loading