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.