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 CHECKOUT FILE FROM ANOTHER BRANCH 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.
Unfortunately I can not right click copy the file path in the 'compare with branch' window either. Currently my preferred solution is still typing 'git checkout otherbranch - here/comes/the/often/annoyingly/long/path/to/the/file/iam/looking/for' in the terminal. Git integration is quite amazing in IntelliJ so I would really look forward to a better solution to pick files from another branch. Btw its also a bit strange that I cannot search by commit hash in the log window. Here it would be handy to either have something like 'go to commit in log' or at least 'copy commit message' to be able to paste and search for it in the git log. However this requires me to (please correct me if I am wrong):Ī) find the commit that last changed the file I want to pick from the other branch in the 'compare with branch' window (the 'Show history for revision' action will only show the revision up to the selected commit in the log) andĪ) can be cumbersome when there are many commits and b) is also a bit annoying because its not so easy to copy the commit message and search for it in the git log: If I hit ctrl+C the whole row is copied (including the date etc.) and I also can not select and right click copy only the commit message. Ok thanks, I did not know the Get action, but its very helpful. and I can't help but wonder if something like what I mocked up below would be as helpful to others as it would for me? cmd-v *paste* file contents in new Java file dialog and.go back to text editor and cmd-c *copy* file contents.cmd-v *paste* class name in Create new Java File Dialog.go to text editor and cmd-c *copy* class name.go to destination package location - or create manually if not yet there.cmd-v *paste* in some external Text editor.find the new file and open in the side-by-side editor.choose Git -> Compare with Branch -> select branch.*slap forehead* when I find that I forgot to copy the contents of that new file - again.figure out in what project module exactly the new file is supposed to live (since that's ain't necessarily clear from the package name alone).It turns out that there is absolutely no way to copy that new file from that other branch to the active branch within the "Git Compare UI", so to speak. In such cases, the local panel of the side-by-side viewer is (obviously) blank. However, this can't cope with (the fairly common, you'd think) situation where the remote branch happens to have a new file.
In the side-by-side viewer window it's easy to cherry-pick the changes and copy whatever is necessary. It happens quite often that I merge the changes on my local git branch with another git branch by using the (context click menu) Git -> Compare with Branch. It looks as if my question has also been asked here but I don't find the answer wholly applies to the question so I'll raise it again.
0 kommentar(er)
