GIT Rebase Fatal on Multiple 0.5GB Binary Files

Question

[This question is essentially reopening git crash during rebase which never had an answer]

I\'m attempting to a rebase from my \'secc\' branch as:

$ git          


        

Answer 1

You won't know if your machine is big enough until failing on the 'git rebase' but by that point your directory is in a munged state. During the rebase another branch was checked out (main) so that the 'secc' changes could be applied to it. Recover, and proceed with:

git checkout secc

Having failed on the rebase, as you've noted you've got two options:

1. If rebase is not required, go with 'git merge main'
2. Get a bigger machine and retry 'git rebase main'

You don't have a practical option to ignore the 0.5GB files, do the rebase, and then get those giga files back.