1

I delete the 'readme.md' file on github.

'readme.md' file is still on my local.

Originally I 'git pull' git will remind me auto-conflict failedenter image description here.

Then I run 'git mergetool',it remind me chooseenter image description here.

Later I choose'delete'.A similar situation occurs again.

when I 'git pull' it won't remind me conflict.

It will 'fast-forword' delete my local file directlyenter image description here.

How should I cancel it 'fast-forword' delete my local file?

qianxiaoning
  • 11
  • 3
  • If the remote branch deleted the file, and you have no changes to the files in the branch you're merging into, then there isn't a conflict, the file is just deleted. – Lasse V. Karlsen May 25 '18 at 15:07
  • Also, please use the preview function when writing questions on Stack Overflow, you'll get many more eyeballs on your question if you make a slight effort in formatting your question so it is readable. – Lasse V. Karlsen May 25 '18 at 15:07
  • yes,you are right.I think I should Add the newline. – qianxiaoning May 27 '18 at 03:47
  • [Why git rm --cached not remove local ever tracked file but others](https://stackoverflow.com/q/55663325/6521116) – LF00 Apr 25 '19 at 01:05

1 Answers1

0

I know.It's because the delete file on github is the latest submission.So it won't remind me conflict when I pull.

qianxiaoning
  • 11
  • 3