title: Two branches made changes to the same file. How to commit the changes of the file made in one branch and push to github master branch?
body: <p>I have 2 branches, one branch for a particular feature, and the master branch. Two branches made some changes to the same file. Now I only want to commit the changes made in the master branch and push to github, leaving the changes made in the feature branch behind. What should I do? </p>