Kiln Branch and Merge How-To
How do you merge a branch repository back into the main trunk and show the history of this merge?
I have a main repository that I created a branch repository from. I then pulled from the branch on my local machine and made some edits. Everything looks good so I would like to push this back into the main repository now.
So in Visual Studio I did a push into the main repository. This worked fine, however when I look at the DAG in the Kiln web interface I see nothing but a straight line for my history. I do not have any indication that anything was merged in from a branch repository.
What is the proper way to preform this type of merge that will an indication that the branch was merged in?
Also, using this type of workflow, do people generally delete the branched repository after a fix has been merged into the main repository? It would seem that this would be necessary, otherwise a project could eventually grow to have tens or even hundreds of old branched repositories.