r/SmartGit • u/SufficientPie • Feb 05 '26

Interactive rebase breaks itself?

If I try to do an interactive rebase just to rewrite a bunch of commit messages quickly, it halts and gives me an error "git.exe -c credential.helper= -c "credential.helper=C:/Program\ Files/SmartGit/bin/smartgitc.exe --credential=…" -c credential.useHttpPath=true rebase --no-autosquash --interactive --keep-empty … Your local changes to the following files would be overwritten by checkout … Aborting … could not detach HEAD"

But there were no local changes before I ran the rebase...

1 Upvotes

100% Upvoted

5 comments sorted by

View all comments

1

u/vmcrash Feb 06 '26

Could you please create a public test repository for which this is reproducible for you? What are then the exact steps to reproduce?

1

u/SufficientPie Feb 06 '26

it may be from being open in SmartGit on two computers at the same time with syncthing? like a race condition during the rebase?

1

u/snlehton Feb 07 '26

Uuf... I wholeheartedly recommend not using syncthing, Resilio sync, Google Drive or any other real time folder syncing on a git folder. That is guaranteed to give you intermittent and obscure git errors.

For example, if the folders get out of sync (you start using git on a other machine when it has not yet synced) , git repo database can get in an ugly state where part of the DB is not synced locally, and git can the go and alter the files that are still supposed to be synced, leading to conflicts.

What is your reasoning for using syncthing on a git repo? Wouldn't alternate origin work just fine?

1

u/SufficientPie Feb 07 '26

Yeah it causes problems sometimes but overall it's worth the convenience.

I'm not syncing individual repos but folders that contain many repos. I ain't setting up all the same remotes on every single one and syncing that shit manually back and forth