this post was submitted on 07 Mar 2025
10 points (100.0% liked)

Programming

426 readers
12 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Rules

  • Follow the programming.dev instance rules
  • Keep content related to programming in some way
  • If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev



founded 2 years ago
MODERATORS
 

Hi, I've got myself stuck on an issue, I've started a big rebase (I know that was already a bad idea to begin with, but, just in case, the information I'm looking for could always come in handy in other occasions), I reordered a few commits and squashed some, while in the process I resolved a few conflicts, then after I resolved one of them and got to the next conflict I realised that I shouldn't have put a certain commit there, is there a way to rewind the process to the previous step while staying in the rebase? That way I could move the commit to where it should be and continue.
I know you can edit the todo (git --edit-todo), but that only works for the next commits, I also can't just reset back by the number of commits I want, e.g. git reset --hard HEAD~4, because for the rebase those commits remain as done and doing git rebase --continue only brings me to where I am already, the next conflict to resolve.
So I wonder, is there a way to move out commits of the done list back into todo? Also for example if I trashed an unmerged file completely while messing around, so I can get it back to its initial state, this would be extremely useful

you are viewing a single comment's thread
view the rest of the comments
[–] QuazarOmega@lemy.lol 1 points 11 hours ago

My issue wasn't so much if it managed to run and more of "I don't want this change to have happened here" kind of thing, still that's a neat tool! I wish I could use it, but the codebase I'm working on is in such a hugely sorry state, no testing suite set up is the last of the many problems that most likely won't be solved because they're not "important enough", not like features (built with cardboard and duct tape), yeah we can't allocate much time at all to code quality and general work for the project infrastructure if we can call it that.
About the generic advice of making smaller rebases one by one, yes, I'll learn to do that, I also solved it like that in the end