Reputation: 732
The problem is that I have two branches:
On feature-branch I have a very simplified version of the repository, which serves me as a landing page. As the master branch is much further in development process from the feature-branch I would like to pull some of its changes.
What I would like to do is to pull changes in folder a
,b
and c
. I've tried cherry pick but it's not exactly what I'm looking for.
Upvotes: 1
Views: 20
Reputation: 83587
Git doesn't support this work flow. feature-branch
should contain everything from master
because eventually it will be merged into master
to integrate whatever feature you are working on.
Upvotes: 1