Why does github merge base into feature branch after conflict

Question

We use feature/develop/master branches for our development. When a feature is done (Let's call it feature/123) we send a pull request to merge to the develop. Sometimes this merge has conflicts so we use Github to resolve the conflict.

My question is why would github merge the entire develop branch into feature/123 after resolving the conflict? I just wanted to merge the feature branch INTO develop not the other way around.

Answer 1

This is a pretty old question, but I got myself on the same situation and trying to figure a reason for this. I could find another answer on stackoverflow about the same topic, which goes deeper on the implication of this. You (and anybody that might have the same question in mind) can find it here: Github resolving conflicts always merges base branch to my current branch