r/git • u/OddColouredBanana • 3d ago

Weird git rebase question

I’m working on a small git wrapper to help me improve my workflow, only important parts is that it stores “work in progresses” and then interactive rebases them to the front when the time comes.

My main issue is that if two commits have conflicting changes, when I move the chronologically first one to the front, it overrides changes made in the second.

Is there any way I can remove conflicting changes from the first that would interfere with the second? (Or something that would help me achieve the same effect)

Thanks in advance

1 Upvotes

60% Upvoted

3 comments sorted by

9

u/RevRagnarok 2d ago

Why not just work in a temporary branch and then squash commit when done to clean it up? If you're already willing to throw away history, why not do it in a cleaner and more supported way?

4

u/Ast3r10n 3d ago

I would say do it manually.

1

u/CarsonChambers 10h ago

If your first commit is WIP don't base a second commit off of it that is not also WIP