What is Git Rebase? (Animated)
6,519
Published 2024-05-15
All Comments (8)
-
Should dive into more details about the negative consequences of merge commits. That’s what I use, as it is the standard on my team, but it rarely causes issues. I’m not opposed to rebase, I actually like it, but it seems that if you’re taking the “skill issue” approach, it goes both ways. If you can mess them both up, why should I actually consider switching?
-
We do rebases but still use merge commits when merging merge requests as our CI workflow depends on merge commit info
-
Sure, it's a skill issue that I always get weird stuff happening when rebasing with conflicts (missing changes, duplicated commits). Merge conflicts are much easier to understand because both versions are the "latest" in their respective branches, so the resolved version becomes the new "latest" version of the file. But I get the impression that if a conflict occurs while rebasing, there are more future commits waiting to be applied to the "resolved" file.
-
Is this a sneak peek at the new Git course?
-
😥
-
I've watched. and continue to use merge.
-
bootleg dev
