Merging from Changeset vs. Merging from Branch

Serious talk - is the result of merging from the most recent Changeset in a branch (e.g. in Branch Explorer) identical to merging from that branch in the branches list?

Because I swear to God I have the creeping suspicion it isn’t, but I can’t find out what the specific behaviour differences are.

Yes, at the end of the day, you are always merging changesets (not branches). A merge has three contributors: source, base and destionation.

In the merge panel, you can always check the merge contributors and a button where we explain how the merge is happening. It’s useful to determine the changesets involved in each merge.

8386086--1106121--upload_2022-8-24_11-38-39.png

1 Like