Re: How to force a pull to succeed?

2017-05-16 Thread Jeff King
On Mon, May 15, 2017 at 11:47:14PM -0400, Jeffrey Walton wrote: > > The fact that you think it is expected is immaterial. Git doesn't > > know (or care) how you made the files different from HEAD, so it > > looks like a damage to it. > > 'git pull' fails and its expected, but 'git pull -f' is

Re: How to force a pull to succeed?

2017-05-15 Thread Jeffrey Walton
On Mon, May 15, 2017 at 11:42 PM, Junio C Hamano wrote: > Jeffrey Walton writes: > >> On Mon, May 15, 2017 at 11:27 PM, Junio C Hamano wrote: >>> Jeffrey Walton writes: >>> I scp'd a file to another machine for

Re: How to force a pull to succeed?

2017-05-15 Thread Junio C Hamano
Jeffrey Walton writes: > On Mon, May 15, 2017 at 11:27 PM, Junio C Hamano wrote: >> Jeffrey Walton writes: >> >>> I scp'd a file to another machine for testing. The change tested OK, >>> so I checked it in on the original machine. >>>

Re: How to force a pull to succeed?

2017-05-15 Thread Jeffrey Walton
On Mon, May 15, 2017 at 11:27 PM, Junio C Hamano wrote: > Jeffrey Walton 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

Re: How to force a pull to succeed?

2017-05-15 Thread Junio C Hamano
Jeffrey Walton 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

How to force a pull to succeed?

2017-05-15 Thread Jeffrey Walton
I scp'd a file to another machine for testing. The change tested OK, so I checked it in on the original machine. I'm now on the remote machine, and I'm trying to pull the same exact file that exists on both local and remote. Git won't allow me to do it, even with -f. I'd really like -f (or