5 ms·
My two cents: I just always squash commits when merging to master/main. That way the main branch has clean commit messages and it's easy to revert later. I thin
by mattwad 5y ago
My two cents: I just always squash commits when merging to master/main. That way the main branch has clean commit messages and it's easy to revert later. I think cherry-picking commits after the fact can also be very time-consuming, especially if you do a lot of refactoring or "clean as you go" as I like to call it. However, I could see it being worth it for open-source.
- derekp7 5y agoWhen you go grocery shopping, you can A) create a list of dinner ideas and the ingredients that you need to pick up, group them in the order that they appear in the store, and head straight to the aisles to get the items. Or B) go in with the list in mind, but wander through the whole store and you may find something else interesting to pick up. Or C) not have any but the most vague dinner ideas, go without a list, and create a week's worth of dinners as you browse picking up interesting items and figuring out what to do with them. All depends on if you want the most efficient approach, or if you want serendipity to strike.
- okl 5y ago> easy to revert later Depends on what you want to revert? git revert accepts more than one commit!
- leni536 5y agoYou can even revert a merge commit, if you specify the parent.