Please, don't. Take the time to understand how merges work, and what the files should look like after a merge. It's really not that hard.
This kind of blanket approach basically only works if the conflicts came from someone not using git correctly in the first place - otherwise you're tossing out changes you probably want to keep.
Please, don't. Take the time to understand how merges work, and what the files should look like after a merge. It's really not that hard.
This kind of blanket approach basically only works if the conflicts came from someone not using git correctly in the first place - otherwise you're tossing out changes you probably want to keep.
true, thanks for the comment, i added a side note !