FAQ Database Discussion Community


Branching and merging Biztalk orchestrations and maps

biztalk,branching-and-merging
If making changes to a Biztalk orchestration (.odx) or map (.btm) in two branches, e.g. in tfs or git, is there robust and well-defined way of merging the changes from one branch to the other?

Should I avoid baseless merges in TFS?

tfs,tfs2013,branching-and-merging,baseless-merge
Simple question perhaps, but one I'm having a hard time finding the answer to. I often work at a client that uses TFS as source control and they completely avoid using the baseless merge feature of TFS source control In part because in the past it required a command line...

How should I add new files when I already have multiple branches

git,branch,git-branch,branching-and-merging
We have recently started using GIT and it has worked out well, but we sometimes hits bumps that we don't know how to best solve. Right now we have multiple branches. master, develop and lots of feature branches (one or more per developer). Now we want to add a directory...

Queue a build from branch B with shelveset from trunk A

visual-studio-2013,tfs,branch,branching-and-merging,shelveset
I'm trying to get a tfs build with a specific shelveset. I need a build of branch A and the shelveset from Branch B. When I right click the build definition of branch A and select 'Queue Build' I can choose 'latest source with shelveset' and selecting the shelve from...

Mercurial - abandoning loose ends

version-control,mercurial,branch,tortoisehg,branching-and-merging
Due to lack of attention, I have made a rollback ("backout") that I had forgot to merge back into the default branch - which I did not notice until a bit later, causing my local history to look like this: Which seems to disallow pushing ("new remote heads"). If I...

Can I use `diff …` as an indicator for branch cleanup?

git,branch,branching-and-merging,git-diff
I have branches where git branch -d some_branch returns branch 'some_branch' is not fully merged. But git diff ...some_branch is empty. In other words, (as I understand) there are no changes that exist in "some_branch" that I don't have in the current. But yet it's not "fully merged". Am I...

Delete a Subversion branch in Netbeans on MAC 10.8.5

svn,netbeans,branching-and-merging
I've created a wrong branch in my Subversion repository. I work with Netbeans 8.0.2 and its Subversion plugin on MAC OS 10.8.5. I don't want to keep this branch, so how can I delete it ?...

Merging strategy with a long development branch. How to prevent heavy conflicts in the future merge?

git,merge,branch,branching-and-merging,branching-strategy
I'm developing a project where I constantly want to make small improvements on master branch and push them to production. I have problem because I want to concurrently work on a branch that will be pushed only after a long time. If I will use different branches on long_project and...

Working with old releases in Git Workflow

git,branching-and-merging,git-workflow
As far as I understand a GIT wokflow is described in the following way: http://nvie.com/posts/a-successful-git-branching-model/ I have a question related to old branches bugfixing in this workflow. Given we have plenty of older release branches merged into master branch. Our last release was release say 2.6. We need to fix...

SVN Branch To Trunk Merge Issue

svn,version-control,branching-and-merging
I have tried Googling the issue at hand, to no avail. My team is in an interesting situation. Our release branch needed to be merged back into our trunk. After about 4 weeks of commits, no one had done so (we usually try to do it once a week). A...

SVN: merging a branch which has moved in the repository

svn,version-control,merge,tortoisesvn,branching-and-merging
So, we have a fairly complex repository layout, the results of the move operation performed here: svn.contoso.com/root_repository_path/ |- project1 |- project2 | |- subprojectA | |- subprojectB |- project3 |- project4 |- |- subprojectA |- |- subprojectB | |- project5 (the project I'm on) Each of these folders has a...

Can mercurial pull changes from forked repo into a new branch?

version-control,mercurial,branch,branching-and-merging
I have a project, biocommons/hgvs. A contributor forked the project, made some changes, and submitted a pull request. I'd like to make some minor changes to those commits, and I'd prefer to do so in a feature branch. Is there a way to pull the PR commits into a new...

Add three versions to a new git repository

git,version-control,merge,versioning,branching-and-merging
I have three different versions of a program, and now, much too late, I would like to move it into a git repository. Would it be possible to start a repository with the live environment and add the test and development environment each into a branch?...

Being given zip archives with .git - how to integrate into own Git repository?

git,bitbucket,git-branch,branching-and-merging
I have purchased an iOS game template and received the source code as a zip-archive including .git subdirectory of the author developer: Then I have created my own BitBucket repository. How should I put the new files there and how to integrate the Git history of the files with the...

How do I create a deploy git branch for my Yeoman project?

git,deployment,gruntjs,yeoman,branching-and-merging
I created a new project using Yeoman. Using Grunt I've created the dist directory. My whole project is on Github, https://github.com/d3a1i0/mykungfuisstrong.com, and I've created a prod branch. My question is how do I get my prod branch to have only the contents of dist instead of having the dist directory...

Git: Why is only 1 merge showing in my history when I have done several?

git,version-control,merge,branch,branching-and-merging
Here is my commit history with git log --pretty=%h --graph (the order of commits goes from bottom to top) * 81e1852 <- I have merged back in twice to get to this * b6cb648 * 3ef6e0b * a1f56c5 * a35a50a * 47b2058 <- I have made a couple of branches...

Git: Merging only branch specific commits

git,repository,git-merge,branching-and-merging
To give you a background the way I monitor Git repository and branches; I have been monitoring two branches starting from each sprint - release and master. Master branch is from where developers create new branch(task specific), implement their changes, and creates pull request which gets merged into the Master....

How can I reset a diverged branch back to master

git,branching-and-merging
Is it possible to reset a remote branch to another remote branch? Let's say I have two branches: master and develop. The develop branch is made from master and used as an integration/build branch. It serves no other purpose. At the end of a sprint all feature branches, which are...