I am using Android studio and commandline both. I have a feature branch that has become a superset of my master branch.

I want to merge all diff commits from this feature branch to master branch. How this can be done.

CodePudding user response：

You can do this :

git checkout master
git merge --no-ff feature-branch

CodePudding user response：

Use cherry pick: https://www.jetbrains.com/help/idea/apply-changes-from-one-branch-to-another.html#cherry-pick

This way you can checkout master, then apply (cherry pick) specific commit from other branch (your feature branch).

Enjoy