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

enhance: navigate to upstream head after fetch, pull, and merge (#1180)

Browse source
This commit is contained in:
Gadfly 2025-04-14 10:42:34 +08:00 • committed by GitHub
parent 245de9b458
commit 17cf402c78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 60 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/ViewModels/Merge.cs
View file

@ -62,7 +62,22 @@ namespace SourceGit.ViewModels
return Task.Run(() =>
{
new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, SetProgressDescription).Exec();
CallUIThread(() => _repo.SetWatcherEnabled(true));
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.SetWatcherEnabled(true);
});
return true;
});
}