go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

fix up some things with the patch handling stuff

Browse Source
This commit is contained in:
Jesse Duffield
2020-03-28 12:52:45 +11:00
parent 0c0231c3e8
commit 517b7d0283
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/commands/git.go
View File

@ -661,7 +661,10 @@ func (c *GitCommand) GenericMerge(commandType string, command string) error {
),
)
if err != nil {
return err
if !strings.Contains(err.Error(), "no rebase in progress") {
return err
}
c.Log.Warn(err)
}
// sometimes we need to do a sequence of things in a rebase but the user needs to