github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-21 13:20:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
A submodule conflict is not resolved until it's Staged.
This commit is contained in:
Göran W
2025-05-24 03:40:17 +02:00
committed by GitHub
parent e28b75b860
commit f3fe90b2e1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ViewModels/Conflict.cs
View File

@@ -1,4 +1,6 @@
namespace SourceGit.ViewModels
using System;
namespace SourceGit.ViewModels
{
public class ConflictSourceBranch
{
@@ -46,7 +48,9 @@
_wc = wc;
_change = change;
IsResolved = new Commands.IsConflictResolved(repo.FullPath, change).Result();
var isSubmodule = repo.Submodules.Find(x => x.Path.Equals(change.Path, StringComparison.Ordinal)) != null;
IsResolved = !isSubmodule && new Commands.IsConflictResolved(repo.FullPath, change).Result();
var context = wc.InProgressContext;
if (context is CherryPickInProgress cherryPick)