How do you branch and merge with TortoiseSVN? [closed]
My easy click-by-click instructions (specific to TortoiseSVN) are in Stack Overflow question What is the simplest way to do branching and merging using TortoiseSVN?.
branching-and-merging
How to resolve git’s “not something we can merge” error
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
How do I create a branch?
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”
TFS 2010 Branch Across Team Projects – Best Practices
I’ll throw an option in to the ring, it may or may not not be useful to you. If it’s any consolation I’ve been pondering over this one for a while now and haven’t been able to come up with a completely satisfactory solution. It’s a really good question and I’d be very interested in … Read more
Mercurial: Merging one file between branches in one repo
WARNING: a “dummy merge”, as is recommended by @Martin_Geisler, can really mess you up, if later you want to do a true merge of the two branches. The dummy merge will be recorded, and say that you merge into the branch you did the dummy merge to — you will not see the changes. Or … Read more
Find unmerged Git branches?
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
git cherry-pick not working
Git is resolving the cherry-pick as a no-op — all of the changes introduced by that commit have been introduced by some commit on your current branch. (Or that’s what Git thinks, anyway.) Verify that the commit you are cherry-picking hasn’t already been merged somehow, as either a proper merge, rebase/cherry-pick, or piecemeal patch. (Use … Read more
Remove large .pack file created by git
The issue is that, even though you removed the files, they are still present in previous revisions. That’s the whole point of git, is that even if you delete something, you can still get it back by accessing the history. What you are looking to do is called rewriting history, and it involved the git … Read more
How to copy commits from one branch to another?
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
How do I safely merge a Git branch into master?
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