For anyone who is hesitant to spend time learning the git cli like I was, just spend an hour on this interactive tutorial [1] and I guarantee you all of these solutions would have come to you easy

https://learngitbranching.js.org/