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

enhance: supports to navigate to target commit while resolving conflicts

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-03-07 12:22:47 +08:00
parent ca6d41ee60
commit 83f23583be
No known key found for this signature in database
3 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ViewModels/Conflict.cs
View file

@ -35,14 +35,8 @@
}
else if (context is RebaseInProgress rebase)
{
Theirs = repo.Branches.Find(x => x.IsLocal && x.Name == rebase.HeadName) ??
new Models.Branch()
{
IsLocal = true,
Name = rebase.HeadName,
FullName = $"refs/heads/{rebase.HeadName}"
};
var b = repo.Branches.Find(x => x.IsLocal && x.Name == rebase.HeadName);
Theirs = (object)b ?? rebase.StoppedAt;
Mine = rebase.Onto;
}
else if (context is RevertInProgress revert)