42 lines
2.7 KiB
YAML
42 lines
2.7 KiB
YAML
uuid:
|
|
- value: 67695589-8db1-45fd-9940-3295330f55cc
|
|
langcode:
|
|
- value: en
|
|
type:
|
|
- target_id: daily_email
|
|
target_type: node_type
|
|
target_uuid: 8bde1f2f-eef9-4f2d-ae9c-96921f8193d7
|
|
revision_timestamp:
|
|
- value: '2025-06-06T22:07:07+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: 'Picking cherries'
|
|
created:
|
|
- value: '2025-06-04T22:04:43+00:00'
|
|
changed:
|
|
- value: '2025-06-06T22:07:07+00:00'
|
|
promote:
|
|
- value: false
|
|
sticky:
|
|
- value: false
|
|
default_langcode:
|
|
- value: true
|
|
revision_translation_affected:
|
|
- value: true
|
|
path:
|
|
- alias: /daily/2025/06/04/picking-cherries
|
|
langcode: en
|
|
body:
|
|
- value: '<p>If you''re working on a feature branch, or a <a href="/daily/2025/06/01/good-commit-messages-dont-always-matter">temporary branch for pair or mob programming</a>, what do you do if you accidentally commit a change to the wrong branch?</p><p>Do you reset your changes, switch to the correct branch and re-create the same changes manually?</p><p>You don''t need to.</p><p>Git has a solution for this.</p><p>Create the commit as you would on the correct branch and copy the commit SHA.</p><p>Use <code>git checkout</code> or <code>git switch</code> to move to the correct branch and use <code>git cherry-pick</code> with the commit SHA.</p><p>It will pluck the commit from the branch and re-apply the changes with the same commit message.</p><p>Then, if you merge or rebase your temporary branch, Git will know the change has already been applied and skip that commit.</p><p>No need to re-do the same changes again manually.</p>'
|
|
format: basic_html
|
|
processed: '<p>If you''re working on a feature branch, or a <a href="http://default/daily/2025/06/01/good-commit-messages-dont-always-matter">temporary branch for pair or mob programming</a>, what do you do if you accidentally commit a change to the wrong branch?</p><p>Do you reset your changes, switch to the correct branch and re-create the same changes manually?</p><p>You don''t need to.</p><p>Git has a solution for this.</p><p>Create the commit as you would on the correct branch and copy the commit SHA.</p><p>Use <code>git checkout</code> or <code>git switch</code> to move to the correct branch and use <code>git cherry-pick</code> with the commit SHA.</p><p>It will pluck the commit from the branch and re-apply the changes with the same commit message.</p><p>Then, if you merge or rebase your temporary branch, Git will know the change has already been applied and skip that commit.</p><p>No need to re-do the same changes again manually.</p>'
|
|
summary: ''
|
|
field_daily_email_cta: { }
|