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. 

 Those are the worst. 😩 good luck. 

 https://ir.mara.com/news-events/press-releases/detail/1343/marathon-digital-holdings-launches-slipstream

Head spook in charge Fred Thiel. 

 Then start the branch from scratch... 🤷🏻

Sometimes it's not worth doing the complicated option.