68 lines
2.7 KiB
YAML
68 lines
2.7 KiB
YAML
uuid:
|
|
- value: 2959438c-8c12-49c7-84a2-d9ea9bf338e6
|
|
langcode:
|
|
- value: en
|
|
type:
|
|
- target_id: daily_email
|
|
target_type: node_type
|
|
target_uuid: 8bde1f2f-eef9-4f2d-ae9c-96921f8193d7
|
|
revision_timestamp:
|
|
- value: '2025-05-11T09:00:01+00:00'
|
|
revision_uid:
|
|
- target_type: user
|
|
target_uuid: b8966985-d4b2-42a7-a319-2e94ccfbb849
|
|
revision_log: { }
|
|
status:
|
|
- value: true
|
|
uid:
|
|
- target_type: user
|
|
target_uuid: b8966985-d4b2-42a7-a319-2e94ccfbb849
|
|
title:
|
|
- value: 'Tidy then push'
|
|
created:
|
|
- value: '2025-02-11T00:00:00+00:00'
|
|
changed:
|
|
- value: '2025-05-11T09:00:01+00:00'
|
|
promote:
|
|
- value: false
|
|
sticky:
|
|
- value: false
|
|
default_langcode:
|
|
- value: true
|
|
revision_translation_affected:
|
|
- value: true
|
|
path:
|
|
- alias: /daily/2025/02/11/tidy
|
|
langcode: en
|
|
body:
|
|
- value: |
|
|
<p>As I said <a href="/daily/2025/02/10/refactoring">in yesterday's email</a>, sometimes you change your mind whilst working on something.</p>
|
|
|
|
<p>Maybe you change your approach and have a commit that supersedes an earlier one, fix a typo, or find a bug and need to revert a commit.</p>
|
|
|
|
<p>If you're pushing your changes to a branch for review, I suggest using <code>git rebase</code> to clean up your commits.</p>
|
|
|
|
<p>You can squash the typo fix into the commit that introduced the typo, or remove the original implementation that you later moved away from.</p>
|
|
|
|
<p>Whilst there is an option to squash all the commits when merging, I don't like it and prefer people to tidy their commits before pushing.</p>
|
|
|
|
<p>This means the commits are easier to review and you can keep the original commit history and all the context within the messages instead of a generic <code>Merge commit..</code> message.</p>
|
|
|
|
|
|
format: full_html
|
|
processed: |
|
|
<p>As I said <a href="/daily/2025/02/10/refactoring">in yesterday's email</a>, sometimes you change your mind whilst working on something.</p>
|
|
|
|
<p>Maybe you change your approach and have a commit that supersedes an earlier one, fix a typo, or find a bug and need to revert a commit.</p>
|
|
|
|
<p>If you're pushing your changes to a branch for review, I suggest using <code>git rebase</code> to clean up your commits.</p>
|
|
|
|
<p>You can squash the typo fix into the commit that introduced the typo, or remove the original implementation that you later moved away from.</p>
|
|
|
|
<p>Whilst there is an option to squash all the commits when merging, I don't like it and prefer people to tidy their commits before pushing.</p>
|
|
|
|
<p>This means the commits are easier to review and you can keep the original commit history and all the context within the messages instead of a generic <code>Merge commit..</code> message.</p>
|
|
|
|
|
|
summary: null
|
|
field_daily_email_cta: { }
|