| ▲ | nixpulvis 4 days ago | |||||||
I'd take fully squashed PRs over endless "fix thing" and "updated wip"... but if you work in a way that leaves a couple meaningful commits, that's even better. Sometimes I end up in this state naturally by having a feature branch, which I work on in sub branches, each being squashed into a single final commit. Or when the bulk of the logic is on one commit, but then a test case or two are added later, or a configuration needs changing. I like merge commits because they preserve the process of the review. | ||||||||
| ▲ | echelon 4 days ago | parent | next [-] | |||||||
> I like merge commits because they preserve the process of the review. I appreciate that, but I still can't square it with my world view. GitHub or whatever tool you use preserves all the comments and feedback and change history if you ever need to go back and reference it. Such instances are limited, and in my experience it's mainly politics and not technical when this happens. The team's PR discussion itself isn't captured in git, so it's lossy to expect this type of artifact to live in git anyway. It's also much less searchable and less first class than just going back to GitHub to access this. Ultimately, these software development artifacts aren't relevant to the production state of the software you're deploying. It feels muddled to put an incomplete version of it into your tree when the better source of truth lives outside. | ||||||||
| ||||||||
| ▲ | hinkley 4 days ago | parent | prev [-] | |||||||
What you have there is people hiding their neuroses and lack of commit hygiene and that’s avoiding the problem not fixing it. | ||||||||