It's all about the answers!

Ask a question

Merge process / collaboration / pull request

Morten Madsen (3053148) | asked Sep 09 '15, 3:22 a.m.
Does anyone know if there are plans for implementing functionality for creating "merge requests" like "I like to merge my feature branch into the release branch". Something like the GitHub "Pull request" or Atlassian Stash. Here you would then get a web-page (or something similar) with the entire merge diff + option to post comments and discuss the merge as a "living" entity.


Accepted answer

permanent link
David Lafreniere (4.8k7) | answered Oct 27 '15, 10:10 a.m.
I am not aware of any plans to add exactly what you are requesting, however in RTC 6.0.1 you could leverage the newly added Code Review feature to achieve most of what you want. The workflow would be as follows
1. Create a work item called "Merge Feature X to Release Branch Y" (i.e. to make it clear what people would be discussing/reviewing)
2. In RTC, change sets (in general) get delivered from a repository workspace to a stream, thus one person would have to bundle up the change sets they want to deliver and attach them to the work item. This may involve creating merge change sets if there are conflicts in the feature stream X vs the branch stream Y.
3. Enable the Code Review feature on the Project Area that owns the work item created in step 1.
4. In the Work Item (in the Web UI), on the Approvals tab, and under the Code Review section, click "Select Stream..." and choose the Release Branch Stream Y. This lets users know the intended deliver destination, and resolves all file/folder paths relative to that Release Branch Stream Y.
5. Now users can click on "Open Code Review" to review the proposed merge, and add "Issues" and comments on particular parts of the code. Or create "general" issues, which are a place to discuss things that do not pertain to particular lines of code.
Morten Madsen selected this answer as the correct answer

Morten Madsen commented Oct 28 '15, 4:56 a.m.

Awesome! Thank you. I didn't know about this upcoming feature. I'll definitely check that out! :-)

Morten Madsen commented Oct 28 '15, 7:19 a.m.


BTW, is there any documentation or description about this feature somewhere?

David Lafreniere commented Oct 28 '15, 8:52 a.m.

There's a mention of it in the 6.0.1 M3 New and Noteworthy here:

Your answer

Register or to post your answer.