leo
|
ef53dd0025
|
refactor: use a new Models.ChangeState.Conflicted to represent all the unmerged file state (#1359)
Signed-off-by: leo <longshuang@msn.cn>
|
2025-05-24 20:25:05 +08:00 |
|
Göran W
|
f3fe90b2e1
|
fix: IsConflictResolved check should not be done for submodules (#1356)
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
A submodule conflict is not resolved until it's Staged.
|
2025-05-24 09:40:17 +08:00 |
|
leo
|
8b39df32cc
|
feature: git command logs
Signed-off-by: leo <longshuang@msn.cn>
|
2025-04-17 13:23:56 +08:00 |
|
leo
|
b4fbc2372b
|
enhance: show commit info tip when hover SHA in conflict view
Signed-off-by: leo <longshuang@msn.cn>
|
2025-03-10 20:02:09 +08:00 |
|
leo
|
855466686d
|
ux: show conflict sources when it comes from a stash or patch (#1067)
Signed-off-by: leo <longshuang@msn.cn>
|
2025-03-10 10:22:49 +08:00 |
|
leo
|
83f23583be
|
enhance: supports to navigate to target commit while resolving conflicts
Signed-off-by: leo <longshuang@msn.cn>
|
2025-03-07 12:22:47 +08:00 |
|
leo
|
dcaeaef48a
|
refactor: re-design conflict panel
|
2024-12-11 11:33:20 +08:00 |
|