When I am committing on my branch I get the following error and warnings. This is after I did this - Why does "git rebase" continue to conflict after choosing the "--ours" version of a file the first time?. Basically, I pulled from main and was asked to run git rebase --continue repeatedly.
I was able to solve the rebase hell by doing the following
git rebase --abort git merge main Here are the errors that I get after committing on my branch:
warning: reflog of 'HEAD' references pruned commits warning: reflog of 'refs/heads/test-shapes-4' references pruned commits warning: reflog of 'refs/heads/test-shapes-10' references pruned commits warning: reflog of 'refs/heads/test-circleci3' references pruned commits warning: reflog of 'refs/heads/test-data-test-ids-2' references pruned commits warning: reflog of 'refs/remotes/origin/test-shapes-4' references pruned commits warning: reflog of 'refs/remotes/origin/test-shapes-10' references pruned commits warning: reflog of 'refs/remotes/origin/test-circleci3' references pruned commits warning: reflog of 'refs/remotes/origin/test-data-test-ids-2' references pruned commits fatal: bad tree object ddddf0a394971911e8601bec1f477515033ba600 fatal: failed to run repack Does anyone know how to solve this issue?
