branching-and-merging

After pushing I've been seeing this message at remote repository: 1 commit behind master. This merge has conflicts that must be resolved before it can be committed. To manually merge these changes into TA20footerLast run the following commands: > git checkout 7c891f50c557 # Note : This will create a detached head! > git merge remotes/origin/master I know this is a late answer but it could help others. Before you begin, if you are uncomfortable with a command line, you can do all the following steps using SourceTree , GitExtension , GitHub Desktop or your favorite tool. Just follow the steps:

I'm trying to unpack my changes to the another branch using TFS Power Tools. I'm trying to execute command tfpt unshelve /migrate "NuGet Build" "/source:$/ProjectName/Main/Source" "/target:$/ProjectName/Main/Source-NuGet" But it returns message 'tfpt : Unable to determine the workspace' . I'm running command from the directory that mapped to this project. Moreover I've tried to use tf workspaces /s:http://our-tfs . Does anyone know how to solve this problem? carzogliore You can define your path in cmd with the TFPT. And then, from there, you go to the destination folder or workspace where you

I've used mercurial for some time now, but haven't really gotten used to working with branches, so I am struggling to figure out whether this workflow makes sense or not before applying it to a real project. The question: Does it really make sense to resurrect a development branch every time we're going to work on a new release by merging production into it, or should we instead make unique named short-lived development branches like development-1.1 ? Description of workflow: Every production-ready revision of our code will be tagged ( 1.0 , 1.1 and so on) and placed in the production branch.

My team has been working in a prototype branch off of master. I now want to take that work, slice it up into different "feature branches", and merge them individually into master. I see a couple ways to do this, neither of which I really like: 1 - Create a new branch, Feature_1, off of master . Manually copy the code from the Prototype to Feature_1. This means I have to keep track of what I've copied when I go to make Feature_N and I lose history. 2 - Create a new branch, Feature_1, off of Prototype . Somehow revert the code that is not part of the first feature in Feature_1. This avoids lying

I am working in a branchX and it has a dozen config files that I do not want to commit. So i marked all the config files as --skip-worktree. Now I want to change to branchY. How do I do it? I tried git checkout branchY and it says Please commit your changes or stash them before you switch branches. So i tried to stash them, using git stash save but it says No local changes to save This is very annoying . Apparently the only solution is use git ls-files -v to get a list of all the skip-worktree files for each file, remove the skip-worktree git stash save git checkout branchY git stash pop

In Team Foundation Server we have several child branches and a Trunk branch. But now we need to promote a child branch as the Trunk branch and discard the current Trunk branch. Furthermore, we need to maintain the history of both the previous Trunk branch and the child branch. PS: We cannot merge the current Trunk branch and child branch due to huge conflicts all over the project. Please go through the visual representation as well: Even without knowing the entire context, this doesn't look like a good branching strategy in your environment. You want to reparent to other branch, you must set a