Git Cherry Pick instead of Git Merge

Thank you! I wanted to know if cherry-picking would preserve the original commit hash from the feature branch or not, and this answered my quesiton. [No, it's a new commit hash]

I'm hereeeee! Thank you so much for the video Eddie 💜 very informative seconds!

I find this useful for when you fix a bug on your branch to facilitate your work but need to release the bugfix before your feature is due for release. You can cherry-pick the fix into the release branch.

To avoid conflicts you can do an interactive rebase to remove the cherry-picked commit from feature, then rebase onto the source branch to pick up the change. Or just solve the conflict if it's not too horrible. The conflicts are the only downside to cherry-pick.