Trying to un-fuck a botched rebase of a months worth of work. It took me a couple days, but it forced me to learn a lot about git's best practises and gotchas. It also taught me not to keep a months worth of work on a single branch!

  • 1

    I don't trust my git abilities at all. When I do a big operation, I copy paste the entire folder before running anything lmao
  • 1
  • 0
    Was a reverse merge out of the question?

    If your branch had a months worth of work that needed merged into your master/main branch, you could always merge it into yours first, then handle the merge conflicts.
  • 0
    Ah yes... I re-learn the importance of committing and merging regularly about once every three months. 😑
Add Comment