3 ms·
Routinely. Common example that I can't see why anyone would take issue with: * Commit 1: Fix a bug * Commit 2: Fix linting issues with the fix discovered t
by 3np 6y ago
Routinely. Common example that I can't see why anyone would take issue with:
* Commit 1: Fix a bug
* Commit 2: Fix linting issues with the fix discovered through CI
* Commit 3: Remove dead/commented code introduced thrugh commit 1
* Commit 4: Update documents as required by change
I'd always squash those into a single commit before merging into upstream.
- asveikau 6y agoI can see a good case for separating #2 from everything else. Or depending on the change, maybe squashing #2 and #3 together separate from 1 and 4. It's a good idea to isolate the bugfix so that reading the diff is clear. Stylistic changes such as #2 and #3 can be separated and called out as "should produce no behavior change" sort of updates.