473

submitted 2 years ago by alphacyberranger@lemmy.world to c/programmer_humor@programming.dev

35 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[-] Blamemeta@lemm.ee 7 points 2 years ago

What you do is create a third branch off master, cherry pick the commits from the feature branch, and merge in the third branch. So much easier.

[-] yogo@lemm.ee 10 points 2 years ago

That’s called rebasing

[-] atyaz@reddthat.com 5 points 2 years ago

That is absolutely not what rebasing does. Rebasing rewrites the commit history, cherry picking commits then doing a normal merge does not rewrite any history.

[-] yogo@lemm.ee 9 points 2 years ago* (last edited 2 years ago)

I’m sorry but that’s incorrect. “Rewriting the commit history” is not possible in git, since commits are immutable. What rebase actually does is reapply each commit between upstream and head on top of upstream, and then reset the current branch to the last commit applied (This is by default, assuming no interactive rebase and other advanced uses). But don’t take my word for it, just read the manual. https://git-scm.com/docs/git-rebase

[-] atyaz@reddthat.com 1 points 2 years ago

"Reapply" is rewriting it on the other branch. The branch you are rebasing to now has a one or multiple commits that do not represent real history. Only the very last commit on the branch is actually what the user rebasing has on their computer.

[-] yogo@lemm.ee 2 points 2 years ago

Cherry picking also rewrites the commits. This is equivalent to rebasing:

git branch -f orig_head
git reset target
git cherry-pick ..orig_head

[-] fiah@discuss.tchncs.de 4 points 2 years ago* (last edited 2 years ago)

for some reason it's easier than normal rebasing though

[-] yogo@lemm.ee 3 points 2 years ago

Have you tried interactive rebase (rebase -i)? I find it very useful

[-] Blamemeta@lemm.ee 0 points 2 years ago

Yeah, but then you deal with merge conflicts

[-] dukk@programming.dev 2 points 2 years ago

You can get merge conflicts in cherry picks too, it’s the same process.

[-] gedhrel@lemmy.ml 2 points 2 years ago

rerere is a lifesaver here.

(I'm also a fan of rebasing; but I also like to land commits that perform a logical and separable chunk of work, because I like history to have decent narrative flow.)

[-] BabaYaga@reddthat.com 3 points 2 years ago

I’ve definitely done this before…

[-] GigglyBobble@kbin.social 3 points 2 years ago

If your cherry-pick doesn't run into conflicts why would your merge? You don't need to merge to master until you're done but you should merge from master to your feature branch regularly to keep it updated.