diff options
| author | Michael Muré <michael.mure@consensys.net> | 2018-11-21 18:56:12 +0100 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2019-03-01 22:35:36 +0100 |
| commit | feab9412dffe5772048aad29893c4cb01d566387 (patch) | |
| tree | b7bc9751f2ebdf8d41f5621bbf372eaf7625c4b9 /bug/bug_actions.go | |
| parent | 0aefae6fcca5786f2c898029c3d6282f760f2c63 (diff) | |
| download | git-bug-feab9412dffe5772048aad29893c4cb01d566387.tar.gz | |
WIP identity in git
Diffstat (limited to 'bug/bug_actions.go')
| -rw-r--r-- | bug/bug_actions.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bug/bug_actions.go b/bug/bug_actions.go index 487ba25e..a21db826 100644 --- a/bug/bug_actions.go +++ b/bug/bug_actions.go @@ -35,6 +35,11 @@ func Pull(repo repository.ClockedRepo, remote string) error { if merge.Err != nil { return merge.Err } + if merge.Status == MergeStatusInvalid { + // Not awesome: simply output the merge failure here as this function + // is only used in tests for now. + fmt.Println(merge) + } } return nil |