Why can a commit be empty when merging branches and how to avoid it?

Question

git

When merging after conflict resolution, it is usually written something like "Merge branch feature_branch into develop" and this commit does not contain an explanation of how the conflict is resolved. Why is that? How to avoid this without resorting to rebase? After all, this does not seem to be normal, because. anything can be contained in this commit, and only manually you can understand what exactly.

Answer 1

As such, there was no conflict, there was no intersection in the changes, in fact you picked up what others committed after your last pull.
git pullbefore the commit.