Try this: git branch –merged master It does what it says on the tin (lists branches which have been merged into master). You can also pull up the inverse with: git branch –no-merged master If you don’t specify master, e.g… git branch –merged then it will show you branches which have been merged into the … Read more
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 … Read more
Create a new branch using the svn copy command as follows: $ svn copy svn+ssh://host.example.com/repos/project/trunk \ svn+ssh://host.example.com/repos/project/branches/NAME_OF_BRANCH \ -m “Creating a branch of project”
Use git cherry-pick <commit> to apply <commit> to your current branch. I myself would probably cross-check the commits I pick in gitk and cherry-pick them with right-clicks on the commit entry there instead. If you want to go more automatic (with all its dangers) and assuming all commits since yesterday happened on wss you could … Read more
Run this from the branch where you want the file to end up: git checkout otherbranch myfile.txt General formulas: git checkout <commit_hash> <relative_path_to_file_or_dir> git checkout <remote_name>/<branch_name> <file_or_dir> 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 … Read more
How I would do this git checkout master git pull origin master git merge test git push origin master 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 … Read more