Run this from the branch where you want the file to end up: General formulas: Some notes (from comments): Using the commit hash, you can pull files from any commit This works for files and directories Overwrites the file myfile.txt and mydir Wildcards don’t work, but relative paths do Multiple paths can be specified An alternative:
As shown in How does “not something we can merge” arise?, this error can arise from a typo in the branch name because you are trying to pull a branch that doesn’t exist. If that is not the problem (as in my case), it is likely that you don’t have a local copy of the branch … Read more
Moving to an existing branch If you want to move your commits to an existing branch, it will look like this: You can store uncommitted edits to your stash before doing this, using git stash. Once complete, you can retrieve the stashed uncommitted edits with git stash pop Moving to a new branch WARNING: This method works because you … Read more
You should really have a workflow that lets you do this all by merging: So all you have to do is git checkout v2.1 and git merge wss. If for some reason you really can’t do this, and you can’t use git rebase to move your wss branch to the right place, the command to grab a single commit from … Read more
Moving to an existing branch If you want to move your commits to an existing branch, it will look like this: You can store uncommitted edits to your stash before doing this, using git stash. Once complete, you can retrieve the stashed uncommitted edits with git stash pop Moving to a new branch WARNING: This method works because you … Read more
How I would do this If I have a local branch from a remote one, I don’t feel comfortable with merging other branches than this one with the remote. Also I would not push my changes, until I’m happy with what I want to push and also I wouldn’t push things at all, that are … Read more