Oooff I'm working on a rebase that feels like it's going to take more time than starting the branch from scratch.
Feels like a 5D Rubick's cube trying to merge one into the other.
Discussion
Those are the worst. 😩 good luck.
Head spook in charge Fred Thiel.
Then start the branch from scratch... 🤷🏻
Sometimes it's not worth doing the complicated option.