Should you use merge commits or rebase when working on large codebases?
Frontend First
00:00
Can You Undo a Head of Maine Build?
The potential for data loss is in the conflict resolution. You can't undo your rebase because you literally rewrote history. The other option is to create a merge commit, which is a feature of get that again happens by default. And now your history has these points in time where you merge in the changes to Maine. But it creates a new shot on top of the work you've already done,. It stays at the same shot and the same point in time in which you actually did it. So there's no history changing it safer.
Transcript
Play full episode
