sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Check for conflicts after reverting a commit

Browse Source 
This way we get the usual menu for viewing the conflicts or aborting, like for
rebases.
This commit is contained in:
Stefan Haller
2025-03-30 21:24:40 +02:00
parent 4b3262ab3e
commit 3e5024480d
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/gui/controllers/local_commits_controller.go
View File

@ -868,7 +868,8 @@ func (self *LocalCommitsController) revert(commit *models.Commit) error {
HandleConfirm: func() error {
self.c.LogAction(self.c.Tr.Actions.RevertCommit)
return self.c.WithWaitingStatusSync(self.c.Tr.RevertingStatus, func() error {
if err := self.c.Git().Commit.Revert(commit.Hash); err != nil {
result := self.c.Git().Commit.Revert(commit.Hash)
if err := self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(result); err != nil {
return err
}
return self.afterRevertCommit()