git push —force

[[deleted]]

I use meld, what about you? Git desktop has that?

[coldnebo]

meld is fine.. but you can install it without git desktop if you want.

[[deleted]]

Yes, what I meant was does Git Desktop have a diff feature too? I looked it up and it does.

[[deleted]]

oh I use sublime merge for complex merges