Let's say there are two branches: master
and feature-one
.
There are some files that you want in the master
branch from the feature-one
branch but not all the files.
Let's say those files are:
app/Models/User.php
app/Controllers/UsersController.php
You can accomplish that by doing the following: