Spyke
lemmy.world

Fun fact! If you have to quickly swap between two different branches you should try:

git checkout -

It will swap to the previous branch you were on. Have fun!

14
lemmy.world

only just found out how cherry picking works I love it

5
Bappityreply
lemmy.world

You can copy a commit that was pushed in branch 1 and paste it to branch 2

4
lemmy.world

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.

1
Bappityreply
lemmy.world

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

2

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.

6

You reached the end

Believe it or not, git checkout | Spyke