Potential improvements to merge workflow + UI

[lklyne]

A couple of ideas / discussion items for the merge workflow

• Should probably include ability to create branch from the branch list
• Should include ability to show branch status in the branch list
• would be nice to see a hierarchy of the branch list from any branch, not just main branch
  • ideally would have some representation of merge status here
  • would be very nice to see a preview of # changes here
• maybe should include ability to review merge request from the child / merge requestor (not sure if this is a test-ism, but it felt weird to have to navigate away to review the request)
• should mirror color convention of green / yellow on non-conflicted activities. show green what will be changed and yellow what will be modified.

• Language in button and top right should be exactly the same
  

Aaron's leftover PR improvements:

• Show a confirmation dialog when clicking on "review" in the Merge Requests modal or indicate somehow that clicking "review" will lock the plan
• Consider implementing full width change highlighting
• Plan page should do something when a user is on the page and someone else locks the plan feat: prevent users from editing locked plan #228
• The "X branches" indicator/button in the nav could probably use more styling. Maybe drop the opacity and up it on hover?

[AaronPlave]

For that "keep X activity" button – would you recommend something like "Keep Current Branch (Target) Activity"? Feels wordy but is more consistent.