diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 12:52:45 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 13:19:35 +1100 |
| commit | 517b7d02839ab87693f19ea571b8bd29f07fd00e (patch) | |
| tree | 7ecdba06d030bcf8473c684b4fdd7a4a5c19875c /pkg/commands | |
| parent | 0c0231c3e835ef93a7fe06a95c28bd00f1da6631 (diff) | |
fix up some things with the patch handling stuff
Diffstat (limited to 'pkg/commands')
| -rw-r--r-- | pkg/commands/git.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/commands/git.go b/pkg/commands/git.go index 19fe9c219..eb765f4fa 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -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 |