If its a fairly complex merge conflict, I use the builtin three way merge in fugitive (vim plugin). I don't normally run into major merge conflicts though.
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.
If its a fairly complex merge conflict, I use the builtin three way merge in fugitive (vim plugin). I don't normally run into major merge conflicts though.