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

code_review: PR #1180

Browse source 
- replace `SetNeedNavigateToUpstreamHead` with `NavigateToBranchDelayed`
- navigate to current HEAD instead of original source HEAD after merge

Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-04-14 11:35:50 +08:00
parent 17cf402c78
commit 0cb2ca78fe
No known key found for this signature in database
5 changed files with 15 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/ViewModels/Merge.cs
View file

@ -64,18 +64,7 @@ namespace SourceGit.ViewModels
new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, SetProgressDescription).Exec();
CallUIThread(() =>
{
switch (Source)
{
case Models.Branch branch:
_repo.NavigateToCommit(branch.Head);
break;
case Models.Commit commit:
_repo.NavigateToCommit(commit.SHA);
break;
case Models.Tag tag:
_repo.NavigateToCommit(tag.SHA);
break;
}
_repo.NavigateToBranchDelayed(_repo.CurrentBranch?.FullName);
_repo.SetWatcherEnabled(true);
});
return true;