Re: How to ignore changes on remote

From: Howard Miller <howard@e-learndesign.co.uk>
Date: Mar 23, 2010, 16:13 UTC
Message-ID: <26ae428a1003230913s447de452rfc7b8df753885365@mail.gmail.com>
In-Reply-To: <d411cc4a1003230905y12839743x400333a0aa2e7018@mail.gmail.com>

On 23 March 2010 16:05, Scott Chacon <schacon@gmail.com> wrote:

Show 11 quoted lines

> Why would we teach someone to do that instead of just recommending the
> far less obscure 'git push -f'?  A leading '+' on the refspec is
> ridiculously confusing compared to "just tell it to force the push
> with -f".  Am I forgetting something?
>
> Also, Howard, what do you mean by "I forgot to merge"?  Do other
> people have push access to this branch?  You can't just tell people
> "use the local version" after you force a push.  If anyone has based
> work off of that point, you're going to get into way more trouble
> forcing a non-ff push than if you just did a merge and then resolved
> all the conflicts as --ours.

I'm not really fussed. I hope not to make a habit of this. I'll probably forget and ask again next time :)

It's not a repo that particularly matters - just a convenience thing for some test scripts. If it had been on a proper production repo then I would just have dealt with the conflicts.