this post was submitted on 11 Aug 2023
302 points (98.7% liked)

Programming Humor

2804 readers
1 users here now

Related Communities [email protected] [email protected] [email protected] [email protected]

Other Programming Communities [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]

founded 2 years ago
MODERATORS
2e8a9d6bb6935a54
302
Believe it or not, git checkout (lemmy.world)
submitted 2 years ago* (last edited 2 years ago) by 2e8a9d6bb6935a54 to c/programminghumor
14 comments fedilink hide all child comments
 

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

you are viewing a single comment's thread
view the rest of the comments
[–] richard_wagner 1 points 2 years ago (1 children)

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.

[–] bappity 2 points 2 years ago (1 children)

the pasted commit will be at the top of the history for branch 2

[–] BradleyUffner 1 points 2 years ago (1 children)

That seems like it would cause chaos if those branches were ever merged.

[–] [email protected] 6 points 2 years ago

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

Common workflow use of cherry-pick:

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

All this works without issue.