• Kissaki
    link
    fedilink
    English
    arrow-up
    1
    ·
    edit-2
    1 day ago

    I’m fine with squash merges for one commit. But otherwise, I consider structuring changes into commits structure too.

    My team merges with merge commits which hold the MR description as a commit description, and MR title as commit title.

    Individual commits are retained and can describe individual changes, while the MR and merge commit describe the whole changeset.

    It’s a very interactive-rebase-heavy workflow (for commit cleanups/structuring when changes are added in review), but it works very well for us.