diff --git a/base/pkg/entry.jl b/base/pkg/entry.jl index 9366547c2f93d..8c633488eaad8 100644 --- a/base/pkg/entry.jl +++ b/base/pkg/entry.jl @@ -247,7 +247,7 @@ function update(branch::AbstractString) end # TODO: handle merge conflicts Base.with_env("GIT_MERGE_AUTOEDIT","no") do - Git.run(`pull -q`, out=DevNull) + Git.run(`pull --rebase -q`, out=DevNull) end end avail = Read.available()