GIT FILE MERGE TOOL CODE

But we want to be done with this task in ten seconds, not ten minutes. Maybe we can just merge the whole branch using РІР‚вЂњsquash, keep the files we want, and throw away the rest. YouРІР‚в„ўre thinking of git add РІР‚вЂњinteractive (which wonРІР‚в„ўt work for our purposes either). We could hunt down the last commit to each of these files and feed that information to git cherry-pick, but that still seems like more work than ought to be necessary. We just want to grab these files in their current state in the feature branch and drop them into the master branch.

We donРІР‚в„ўt want to have to track down all the commits related to these files. 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.

GIT FILE MERGE TOOL CODE

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.

Git file merge tool