How to checkout only part of file from another local branch

Question

Let's say I have two local branches master and slave. Did some work on master and committed changes.

Now I want include only part of file from my master to slave.

I do know that how to include whole file. git checkout `slave` git checkout `master` -- <file>

But that doesn't solve my problem.

score 0 · Accepted Answer · answered May 26 '16 at 20:59

0

git checkout `slave` 
mv file file.slave
git checkout `master` -- <file>
mv file file.master
// now munge file.slave with file.master parts you want

answered May 26 '16 at 20:59

David Neiss

Thanks for advice. But there should be a better solution using only `git`. – Dennis Grinch May 26 '16 at 21:07
Try an interactive rebase of master onto slave and edit the commit of interest. – David Neiss May 26 '16 at 21:15
Never mind I found a solution. `git checkout -p master -- `. No I can choose what to include. Thanks anyway. – Dennis Grinch May 26 '16 at 21:38

1 Answers1