diff options
| -rw-r--r-- | tools/rebaseline/add_legacy_flag.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/rebaseline/add_legacy_flag.py b/tools/rebaseline/add_legacy_flag.py index 8a99e517b6..9ccfd8cad7 100644 --- a/tools/rebaseline/add_legacy_flag.py +++ b/tools/rebaseline/add_legacy_flag.py @@ -66,6 +66,10 @@ def add_to_chromium(args): subprocess.check_call(['git', 'stash', 'pop']) exit(1) + # Update the repository to avoid conflicts + subprocess.check_call(['git', 'pull']) + subprocess.check_call(['gclient', 'sync']); + # Use random number to avoid branch name collision. # We'll delete the branch in the end. random = randint(1, 10000) |