Branch-based review: how to see diff between parent branch and current, not diff of each commit on dev branch?

In 3.7, I'm using the branch based stuff, but what our developers are trying to achieve, is a review of the final branch contents when ready for delivering back to its parent branch; thus, the CR should show each file that changed relative to the parent branch.

But instead each diff shown is always the diff for that particular commit, not against the parent branch.


How do we get this?

1 answer

0 vote

Hi @Eddie Galvez,

If by

I'm using the branch based stuff

you mean you are adding branches to review as explained in then you should see expected diffs.  Basically assuming you are working on a feature branch called "featureBranch", you branched from "parentBranch" and you are about to merge changes back to "parentBranch" but want to review your changes, all you need to do is to add branch to review selecting "featureBranch" as a "Branch to review" and ensuring base branch is set to "parentBranch".  Once you do this, you should see only 2 revisions of each file, one being the last changeset on the "parentBranch" made prior to the branch point and the other being the last change of that file on a "featureBranch".

Hope that helps,

Suggest an answer

Log in or Join to answer
Community showcase
Davin Studer
Published yesterday in Confluence

FUME – A Better Confluence User Macro Editor Experience

...\\.title', editorDiv: 'userMacroEditorDiv', isNew: function(){ return AJS.$('#user-macro-form').prop('name') == 'addusermacro' ? true : false; }, editor: null, isDirty...

28 views 0 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot