Skip to content

Commit

Permalink
Merge pull request #39215 from code-dot-org/use-origin-staging-in-i18…
Browse files Browse the repository at this point in the history
…n-sync

sync-all now checks origin/staging to see if the sync has been merged
  • Loading branch information
daynew committed Feb 24, 2021
2 parents 5069a5b + b92f745 commit 7d45037
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion bin/i18n/sync-all.rb
Expand Up @@ -146,7 +146,7 @@ def return_to_staging_branch
when /^i18n-sync/
# If we're on an i18n sync branch, only return to staging if the branch
# has been merged.
return unless GitUtils.current_branch_merged_into? "staging"
return unless GitUtils.current_branch_merged_into? "origin/staging"
else
# If we're on some other branch, then we're in some kind of weird state,
# so error out.
Expand Down

0 comments on commit 7d45037

Please sign in to comment.