Skip to content
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.

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

Use a single squashed commit for downstream syncs #1456

Open
jgraham opened this issue Jul 4, 2022 · 0 comments
Open

Use a single squashed commit for downstream syncs #1456

jgraham opened this issue Jul 4, 2022 · 0 comments

Comments

@jgraham
Copy link
Member

jgraham commented Jul 4, 2022

In the past we had the ambition of running Gecko CI for each commit of a GitHub PR. However that didn't work out, and we ended up only starting the sync process after the PR had merged. However we're still applying the commits from the PR one at a time, rather than squashing and applying the whole diff like we do for landings. This increases the chance of merge conflicts, and makes it harder to deal with PRs that have a strange merge history. We should change to just squash for downstream syncs, and consider cherry-picking the squashed commit for the landing, rather than recreating it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant