Commit 6d56e8f1 authored by Lin Jen-Shin's avatar Lin Jen-Shin 🍪

Make sure our EE copy is more up-to-date than CE

parent 8f5253b5
......@@ -30,11 +30,13 @@ class UpstreamMerge
def prepare_upstream_merge
$stdout.puts "Prepare repository...".colorize(:green)
repository.checkout_new_branch(merge_branch)
# We fetch CE first to make sure our EE copy is more up-to-date!
repository.fetch('master', remote: :upstream)
repository.fetch('master', remote: :origin)
repository.checkout_new_branch(merge_branch, base: 'origin/master')
end
def execute_upstream_merge
repository.fetch('master', remote: :upstream)
result = repository.merge('upstream/master', merge_branch, no_ff: true)
# Depending on Git version, it's "up-to-date" or "up to date"...
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment