sanpal7686 sanpal7686 04-02-2024 Computers and Technology contestada When you have fixed a file which conflicted in a merge, how do you tell git you want to keep the file as it currently stands?