Switch to "Local Changes" tab when rebase fails with conflicts

This commit is contained in:
Luis von der Eltz 2025-05-08 17:35:43 +02:00
parent a960e14368
commit 9e2ad730b1
2 changed files with 17 additions and 1 deletions

View file

@ -51,8 +51,19 @@ namespace SourceGit.ViewModels
return Task.Run(() => return Task.Run(() =>
{ {
new Commands.Rebase(_repo.FullPath, _revision, AutoStash).Use(log).Exec(); new Commands.Rebase(_repo.FullPath, _revision, AutoStash).Use(log).Exec();
log.Complete(); log.Complete();
CallUIThread(() => _repo.SetWatcherEnabled(true)); CallUIThread(() =>
{
_repo.RefreshWorkingCopyChanges();
if (_repo.HasUnresolvedConflicts)
{
_repo.SelectedViewIndex = 1;
}
_repo.SetWatcherEnabled(true);
});
return true; return true;
}); });
} }

View file

@ -398,6 +398,11 @@ namespace SourceGit.ViewModels
get => _workingCopy?.InProgressContext; get => _workingCopy?.InProgressContext;
} }
public bool HasUnresolvedConflicts
{
get => _workingCopy?.HasUnsolvedConflicts ?? false;
}
public Models.BisectState BisectState public Models.BisectState BisectState
{ {
get => _bisectState; get => _bisectState;