2e8a9d6bb6935a54Aug 11, 2023

Believe it or not, git checkout

https://lemmy.world/post/3019211

Believe it or not, git checkout - Lemmy.world

> Want to make a branch ? > git checkout > Want to make switch branches ? > git checkout > Want to get a specific file version ? > git checkout > Want to get remove changes to one file ? > Believe it or not, also > git checkout

Show threadBappityAug 11, 2023
only just found out how cherry picking works I love it
Show threadrichard_wagnerAug 11, 2023
Nice, would you explain cherry picking to me, a dummy?
Show threadBappity
You can take a commit that was pushed in branch 1 and copy it to branch 2
Aug 11, 2023 at 2:28pmWeb
Show threadrichard_wagnerAug 11, 2023

Thanks. I wonder what effect that has on the git history of branch 2?

For some reason I thought cherry picking might be the ability to take any file from any commit on any branch and copying it to the current branch.

Show threadBappityAug 11, 2023
the pasted commit will be at the top of the history for branch 2
Show threadBradleyUffnerAug 11, 2023
That seems like it would cause chaos if those branches were ever merged.
Show threadUgly BobAug 11, 2023

Git’s smart enough to realize it’s the same commit and skip it.

Common workflow use of cherry-pick:

  • Say you have a master branch and a release branch
  • You have a bug in production (off your release branch)
  • You have other changes in master that are not ready for release
  • You make a commit to fix the bug and merge to master, run CI and verify it’s fixed
  • Cherry pick the change to the release branch and release as normal
  • Merge with master before next release to make sure you can cut a new release

    • All this works without issue.