Re: How to force a pull to succeed?
- Date: Mon, 15 May 2017 23:32:33 -0400
- From: Jeffrey Walton <noloader@xxxxxxxxx>
- Subject: Re: How to force a pull to succeed?
On Mon, May 15, 2017 at 11:27 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Jeffrey Walton <noloader@xxxxxxxxx> 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
> 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
> before doing a "git pull" to clear the damage you caused manually
> with your "scp".
There's no damage. Its expected.