branching-and-merging

I'm having trouble merging a subtree of a development branch back into the integration branch. I have two branches, one was used for development and one is used for integration. Extensive development has been done in the development branch and I want to merge a portion of it back in. The specific portion that I want to merge is all contained in one subtree of the development branch. My directory structure is like this: [Branch A] [Branch B] | | +--Dir1 +--Dir1 +--Dir2 +--Dir2 | | | +--DirA | +--DirA | | | +--File1 | +--File1 +--File2 | +--File2 | +--File3 | +--File4 +--Dir3 I want to merge

If developers were to work on different branches for different features I understand that they can give a QA build from the feature branch and once it is tested it can be merged with "develop". But if the QA team is fairly large and can test multiple features at once how can they be given a build containing features that are residing in different branches? VonC But if the QA team is fairly large and can test multiple features at once how can they be given a build containing features that are residing in different branches? That would be by: setting up an integration branch, reset to the latest

Good evening! I know this is very usual and there are probably thousands of answers on the internet but I couldn't find one that was helfull. I have two local branches: MASTER Mk I made a lot of changes to Mk, committed these, and switched to MASTER to merge these two branches. But there were conflicts. So now I am on the MASTER branch, can not switch to Mk anymore, but need to override my MASTER with Mk. It keeps saying error: Your local changes to the following files would be overwritten by merge Is there a way to do this? git mergetool --tool=meld #No files need merging git merge -s theirs

I am pretty new to TFS and source control. I unable to understand the advantage of branching. Since i can do the same stuff by creating 2 folder main and development, when I am done with development.I can merge the code using any diff tool with the main branch. Then whats the point of having branches ? I know there must a huge advantage but i am unable to understand. (UPDATE: TFS now supports git for version control so the rest of this answer no longer applies) I would google branch-per-feature. The main advantage of branching is that you can work on a feature and not be interrupted by anyone

My git repository has 2 branches: master and develop. I want a script that merges all changes from develop to master automatically. I used Jenkins: The Git plugin clones the repository and then this script (the 'version' variable is a job parameter) is run: # merge git checkout -b develop origin/develop git checkout master git merge -Xtheirs --squash develop -m "v${version}" # commit git commit -m "v${version}" # tag git tag v${version} -m "v${version}" # push git push origin v${version} I tried it on a test repository and it fails with: git merge -Xtheirs develop CONFLICT (delete/modify):

Simple example. This is 'master': root - index.html - readme.md This is a branch called 'dev': root src - index.jade dist - index.html I'd like to take the index.html file (or all files, really) in the 'dist' folder of the 'dev' branch and replace or merge it with the one in the root directory of my master branch. I've tried, from master: git checkout dev dist/ But it produces this result: root dist - index.html - index.html Clearly not what I want. Is git capable of doing what I want it to do or will I just have to whip up a script? Thanks! This can be accomplished using the subtree merge