Preview (or show draft of) a merge
I used to work with Azure Devops and what I miss the most is being able to preview a merge (or to create a draft of a merge).
The idea behind this is that you see the actual changes when a branch would be merged. I have two reasons for this request:
Currently with plastic you cant exactly see what the code will look like after a merge. When you currently do a code review, you don't know what the code will look after all conflicts are resolved.
When a (feature) branch exists for a longer time, it's common to merge main into it occasionally. This avoids the branch from "getting old" and decreases the chance for conflicts in the future. But currently, when you want to review a branch, you don't know which changes are from the branch itself and which changes actually came from main. This makes a code review almost impossible when main has been merged into it a couple of times. I would really like to preview the merge, so I only have to look at the actual merge changes.
I'm aware that you could merge a branch with main and look at the actual changes before clicking the Checkin button. But I can only do that after I resolved the conflicts. And the owner of the branch should take care of the conflicts, not the reviewer.
I really really hope this feature will be a part of Plastic at some point :)
-
Joram van Schaik commented
I forgot to mention that this feature is not only helpful when reviewing code, but could also be used to solve conflicts (without merging) before submitting your code for review.