Skip to content

Fix: Force-push to existing sync branch erases human's work-in-progress #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Force-push to existing sync branch erases human's work-in-progress #338

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions scripts/sync-translations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,19 @@ async function syncContentWithUpstream(languageCode) {
await exec(`git commit -am "merging all conflicts"`, options);
}

// Create a new pull request, listing all conflicting files
await exec(`git push --set-upstream --force origin ${syncBranch}`, options);
try {
await exec(`git push --set-upstream origin ${syncBranch}`, options);
} catch (error) {
// If push fails, it is likely because the remote has been already
// updated by a human contributor.
console.log(
`Push to origin/${syncBranch} failed (likely due to remote updates by human contributors).\n` +
`Error: ${error.message}`
);
return;
}

// Create a new pull request, listing all conflicting files
const title = `Sync with ${MAIN_REPOSITORY_NAME} @ ${shortHash}`;

let conflictsText = '';
Expand Down