git cherry-pick wants to merge a commit - not a file - from one branch into another branch. The team has made numerous commits to the files in question. Isn’t this exactly what git cherry-pick is made for? Not so fast. This seems like it should be a simple enough task, so we start rummaging through our Git toolbox looking for just the right instrument.
The code you need to grab is isolated to a handful of files, and those files don’t yet exist in the master branch.
(For this example, we’ll assume mainline development occurs in the master branch.) You’re not ready to merge the entire feature branch into master just yet. Something comes up, and you need to add some of the code from that branch back into your mainline development branch. They’ve been working on the branch for several days now, and they’ve been committing changes every hour or so. Part of your team is hard at work developing a new feature in another branch.
0 kommentar(er)
