🚚 Squash merge Weblate PRs #5274
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We used to regular-merge Weblate PRs, which leads to a giant history of Weblate commits in the commit history, making it hard to find functional changes. We weren't able to squash-merge Weblate PRs because it would easily lead to merge conflicts. Now that we control when Weblate pulls and creates commits, this problem has disappeared, so we can safely squash-merge and get a nicer history.
Felienne
approved these changes
Mar 18, 2024
|
Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to allow changes to be pushed to your fork). |
|
Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to allow changes to be pushed to your fork). |
1 similar comment
|
Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to allow changes to be pushed to your fork). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We used to regular-merge Weblate PRs, which leads to a giant history of Weblate commits in the commit history, making it hard to find functional changes.
We weren't able to squash-merge Weblate PRs because it would easily lead to merge conflicts.
Now that we control when Weblate pulls and creates commits, this problem has disappeared, so we can safely squash-merge and get a nicer history.