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.

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

Jump to bottom

🚚 Squash merge Weblate PRs #5274

Merged
merged 2 commits into from
Mar 18, 2024
Merged

🚚 Squash merge Weblate PRs #5274

merged 2 commits into from
Mar 18, 2024

Commits on Mar 18, 2024

  1. 🚚 Squash merge Weblate PRs 

    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.
    @rix0rrr
    rix0rrr committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    226fbcd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into squash-weblate

    @mergify
    mergify[bot] authored Mar 18, 2024
    Configuration menu
    Copy the full SHA
    17a3d94 View commit details
    Browse the repository at this point in the history