From: Howard Miller Date: Tue, 23 Mar 2010 13:54:54 GMT Subject: How to ignore changes on remote Message-ID: <26ae428a1003230654m50c35caci4a02e2df321f289c@mail.gmail.com> 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!