In what situation is git unable to merge a feature branch into the master branch automatically?

Question

Answer

a.  None of the options

Answer

e.  When the feature branch and the master branch both have commited changes at different file locations

Answer

b.  All of the options

Answer

c.  When the feature branch has a commited change but and the master branch has no commited changes

Answer

d.  When the feature branch and the master branch both have commited changes at the same file location

Crowdly