How can I discard all conflict files in source tree or git when I try to make pull. Right now I search every file and do it one by one which seems to me little bit hilarious.
Asked
Active
Viewed 293 times
0
-
Do you want to keep the files as they are in the working copy, or overwrite them with the newer ones from the repository? – orbrey Nov 04 '14 at 10:05
-
Overwrite, but only those with conflict. – mardok Nov 04 '14 at 10:45
-
This answer should help: http://stackoverflow.com/questions/1125968/force-git-to-overwrite-local-files-on-pull – orbrey Nov 04 '14 at 11:17
-
Thank you, I will try it :) – mardok Nov 04 '14 at 11:31
1 Answers
-1
Go list of unstaged files , Press Shift button and select the unwanted files you want to discard. And then have right click on them to discard.
hope this was helpful
Suraj
- 425
- 4
- 8