14
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 07 Mar 2025
14 points (93.8% liked)
Programming
18728 readers
558 users here now
Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!
Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.
Hope you enjoy the instance!
Rules
Rules
- Follow the programming.dev instance rules
- Keep content related to programming in some way
- If you're posting long videos try to add in some form of tldr for those who don't want to watch videos
Wormhole
Follow the wormhole through a path of communities !webdev@programming.dev
founded 2 years ago
MODERATORS
How does cherry picking improve the workflow? I'm not sure I understand, is it so you can keep the original branch as reference and know where you could have screwed up if it happens?
This is what
cherry-pick
does for me. Now that the work is all done, I cancherry-pick
the commits into the new branch in any order I find convenient (and often in an order that causes fewergit
conflicts, or nogit
conflicts to resolve.)Note that this approach is much stronger if the original commits are fairly focused and purposeful.
In extreme cases, I stop and rebase the new or old branch to clean up the commits before I
cherry-pick
them onto the same branch.In essence, all of these techniques are just ways for me to very slowly and methodically organize thoughts, using
git
.Also, sometimes it's all too messy and I just copy and paste all the change I need into a fresh clean branch.
I see, now that makes sense to me as well! I too make commits messily as thoughts crop up, so I think this technique might be good for me in some cases, thanks!