dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-06 11:34:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: IsConflictResolved check should not be done for submodules (#1356)
Some checks are pending
Continuous Integration / Build (push) Waiting to run
Details
Continuous Integration / Prepare version string (push) Waiting to run
Details
Continuous Integration / Package (push) Blocked by required conditions
Details

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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 public class ConflictSourceBranch
{ {
@ -46,7 +48,9 @@
_wc = wc; _wc = wc;
_change = change; _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; var context = wc.InProgressContext;
if (context is CherryPickInProgress cherryPick) if (context is CherryPickInProgress cherryPick)