I agree that conflicts can be a nightmare. From my experience most of the conflicts can be resolved automatically using proper diff and merge tool. I use SementucMerge which understands the changes and provides automatic merge if possible.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
I agree that conflicts can be a nightmare. From my experience most of the conflicts can be resolved automatically using proper diff and merge tool. I use SementucMerge which understands the changes and provides automatic merge if possible.