Re: How to force a pull to succeed?

From: Jeffrey Walton <noloader@gmail.com>
Date: May 16, 2017, 03:32 UTC
Message-ID: <CAH8yC8mOc68A-0uM8b3AKAYo9VqYNUjHkGw0knbXL0suM25tfA@mail.gmail.com>
In-Reply-To: <xmqq8tlx4h1y.fsf@gitster.mtv.corp.google.com>

On Mon, May 15, 2017 at 11:27 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 18 quoted lines

> Jeffrey Walton <noloader@gmail.com> writes:
>
>> I scp'd a file to another machine for testing. The change tested OK,
>> so I checked it in on the original machine.
>> ...
>> How do I force the pull to succeed?
>
> Git doesn't know (or care) if you "scp"ed a file from a known to be
> good place, or if you modified it in the editor.  When it notices
> that there are differences you may rather not to lose in these files
> (because they are different from HEAD), it refrains from touching
> them.
>
> So the way to go forward is for you to make sure that you do not
> have such local changes in the repository that your "pull" is trying
> to touch.  An easiest way would be to do
>
>         git checkout HEAD -- <paths>..

Thanks. That's an extra command. Is there any way to roll it up into one command?

> before doing a "git pull" to clear the damage you caused manually
> with your "scp".

There's no damage. Its expected.

Jeff