this post was submitted on 20 Mar 2025
71 points (100.0% liked)
Programming
19177 readers
167 users here now
Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!
Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.
Hope you enjoy the instance!
Rules
Rules
- Follow the programming.dev instance rules
- Keep content related to programming in some way
- If you're posting long videos try to add in some form of tldr for those who don't want to watch videos
Wormhole
Follow the wormhole through a path of communities [email protected]
founded 2 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Always squashing is a bit much for my taste, sometimes the individual commits have interesting information! Text from the MR in the merge commit is great though, maybe I should see if we can set that up with gitlab and propose that we start doing that at work.
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.