diff options
Diffstat (limited to 'git-codereview/submit.go')
| -rw-r--r-- | git-codereview/submit.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/git-codereview/submit.go b/git-codereview/submit.go index 19d38e3..bff713d 100644 --- a/git-codereview/submit.go +++ b/git-codereview/submit.go @@ -106,12 +106,6 @@ func submit(b *Branch, c *Commit) *GerritChange { } } - // Don't bother if the server can't merge the changes. - if !g.Mergeable { - // Server cannot merge; explicit sync is needed. - dief("cannot submit: conflicting changes submitted, run 'git sync'") - } - if *noRun { printf("stopped before submit") return g |