• Bruce Dawson's avatar
    Make in-progress message more helpful · f0532662
    Bruce Dawson authored
    merge_to_branch.py can fail partway through for many reasons (the EDITOR
    environment variable not being set being one) and on the next run this
    leads to an error saying:
    
        Exception: A merge is already in progress
    
    It is not obvious to those doing their first merge how to get past this.
    Searching the source code leads to the -f option but it should be
    possible to proceed without searching the source. This change adds
    "Use -f to continue" to the message.
    
    Change-Id: Ic9d8e404e044be3308e5ae3ef3a4430e4aa3ccc2
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1837028Reviewed-by: 's avatarYang Guo <yangguo@chromium.org>
    Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#64096}
    f0532662
Name
Last commit
Last update
..
testdata/v8/third_party/googletest/src/googletest/include/gtest Loading commit data...
PRESUBMIT.py Loading commit data...
auto_push.py Loading commit data...
auto_roll.py Loading commit data...
auto_tag.py Loading commit data...
check_clusterfuzz.py Loading commit data...
common_includes.py Loading commit data...
create_release.py Loading commit data...
filter_build_files.py Loading commit data...
git_recipes.py Loading commit data...
merge_to_branch.py Loading commit data...
mergeinfo.py Loading commit data...
push_to_candidates.py Loading commit data...
roll_merge.py Loading commit data...
script_test.py Loading commit data...
search_related_commits.py Loading commit data...
test_mergeinfo.py Loading commit data...
test_scripts.py Loading commit data...
test_search_related_commits.py Loading commit data...