Yes. Say you're in the master branch and you want to check a branch called 'feature' for conflicts. Do git merge feature --no-ff --no-commit. Once you have what you need, to get out of the state this puts git in, do git merge --abort.
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.
Is it possible to see conflicts before merging the code using git ?
Yes. Say you're in the master branch and you want to check a branch called 'feature' for conflicts. Do
git merge feature --no-ff --no-commit. Once you have what you need, to get out of the state this puts git in, dogit merge --abort.