This question already has an answer here:
I'm new to git and when I try to merge one branch into another, I'm getting a bunch of errors, like this:
CONFLICT (modify/delete): src/controller/app.js deleted in feat_branch and modified in HEAD. Version HEAD of src/controller/app.js left in tree. CONFLICT (modify/delete): src/controller/service.js deleted in feat_branch and modified in HEAD. Version HEAD of src/controller/service.js left in tree. ...
Im trying to merge using this command
git merge feat_branch --no-ff
What am I doing wrong or why this is generating these errors?