Not saved file cause lost git information

[rsese]

From @theGABS on March 7, 2018 12:25

Prerequisites

• [X ] Put an X between the brackets on this line if you have done all of the following:
  • Reproduced the problem in Safe Mode: https://flight-manual.atom.io/hacking-atom/sections/debugging/#using-safe-mode
  • Followed all applicable steps in the debugging guide: https://flight-manual.atom.io/hacking-atom/sections/debugging/
  • Checked the FAQs on the message board for common solutions: https://discuss.atom.io/c/faq
  • Checked that your issue isn't already filed: https://github.com/issues?utf8=✓&q=is%3Aissue+user%3Aatom
  • Checked that there is not already an Atom package that provides the described functionality: https://atom.io/packages

Description

If I have not saved file after git merge I still see old state of file

Steps to Reproduce

1. Open file index.js
2. Change something but not save
3. Do git pull witch should cause merge conflict for index.js file (I do from console)

Expected behavior: Not sure, but I want to see correct git file with <<<<<<< HEAD etc.

Actual behavior: I see old version of not saved file. So information from git lost.

Reproduces how often: Everytime

Versions 1.24.0 MacOS Hish sierra

Copied from original issue: atom/atom#16895

[rsese]

Thanks for the report @theGABS - just to clarify, is this reproducible for you (if I follow your steps exactly, that doesn't generate a merge conflict, can you expand on the steps you took)?

I tested and see that if I generate a merge conflict by pulling from the command line, I do see the merge conflict markers - this is what I did with a test GitHub repo:

1. Clone the repo git clone https://github.com/user/repo; cd repo
2. In Atom, for some file in the repository, edit a line
3. Stage and commit the change
4. On github.com, edit the same line from step 2
5. In Terminal run git pull

At this point, the file I edited in step 2 now shows the merge conflict markers in Atom.