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.
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
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.