Confusing git conflicts

Question

Hi I really don't understand why git say this is a conflict.

Do you have any idea?

Answer 1

That means the line was:

• deleted in integrate branch
• modified in feature/xxx branch

Git cannot chose automatically which action to apply for that line, hence the conflict for you to resolve:

• delete
• or keep the line from feature/xxx.