0
  1. I run git merge
  2. the Auto merge fails and I get conflict
  3. I change the file (to solve the conflict)

how to revert to 2 on a specific file without loss the other changed I make

Raful Chizkiyahu
  • 364
  • 2
  • 15
  • 3
    Does this answer your question? [Restart/undo conflict resolution in a single file](https://stackoverflow.com/questions/14409420/restart-undo-conflict-resolution-in-a-single-file) – Omer Tuchfeld Jul 26 '20 at 14:22

1 Answers1

1

To get the file into the original conflicted content after merge?

git checkout -m -- path-to-file

Don't know if git restore can do it as well.

eftshift0
  • 26,375
  • 3
  • 36
  • 60