opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Copy daily emails from Tome

Browse source
This commit is contained in:
Oliver Davies 2025-08-21 18:06:57 +01:00
parent 1b8441608f
commit b438b27847
70 changed files with 1907 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
source/_posts/2025-06-04.md Normal file
View file

@ -0,0 +1,7 @@
---
date: 2025-06-04
title: Picking cherries
permalink: /daily/2025/06/04/picking-cherries
---
<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>