re: A Thorough Introduction to Git's Interactive Patch Mode VIEW POST

TOP OF THREAD FULL DISCUSSION
re: 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, do git merge --abort.

code of conduct - report abuse