473
History repeats itself
(lemmy.world)
Welcome to Programmer Humor!
This is a place where you can post jokes, memes, humor, etc. related to programming!
For sharing awful code theres also Programming Horror.
OK. Query.
Rebase or merge into current?
I personally never rebase. It always seems to have some problem. I'm surely there's a place and time for rebasing but I've never seen it in action I guess.
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.
That’s called rebasing
for some reason it's easier than normal rebasing though
Have you tried interactive rebase (rebase -i)? I find it very useful
Yeah, but then you deal with merge conflicts
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.)
You can get merge conflicts in cherry picks too, it’s the same process.