search

FredrikNoren / ungit

The easiest way to use git. On any platform. Anywhere.
MIT License
10.44k stars 637 forks source link

Can't push after rebase as push cannot be forced. #165

Closed UhhhWaitWhat closed 11 years ago

UhhhWaitWhat commented 11 years ago

I hope this has not been reported yet/is an error on my part. If one rebases a branch, the next push has to be run with '-f' as it overwrites part of the remotes commit history. Currently ungit just disconnects if a push is attempted after a rebase.

Ajedi32 commented 11 years ago

That's only true if you're rebasing stuff that you already pushed. But yeah, I'm guessing Ungit has no way of prompting the user for a forced push when necessary.

At the very least it should display a helpful error message, and not just disconnect.

UhhhWaitWhat commented 11 years ago

Yeah, of course you are right, and something like an error message would obviously suffice.

FredrikNoren commented 11 years ago

Closing as duplicate of #88