My remote branch has changes that are not fast forward (I forgot to merge). I have now made incompatible changes on my local branch. I simply want to use the local version and push it to the remote. I don't care about the remote version. I don't want to merge as there'll be loads of conflicts and the answer will always be 'use the local one'. Is there an easy way to do this? I can't think of anything. Cheers! -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html