Branches, MMT, and merges

[ids]

I just had a curious thing happen. Something unexpected actually.
I was using MMT to update my working branch. There were limited sections of code modified. Just 2 pages and 2 Theme Components Content sections.
When the task was complete I can now merge these changes into the working/primary branch.

The merge was successful. Problem is, the merge also did some sort of update to other page templates. The initial indicator is that a note was added from the last PUSH operation. And it turns out that page started to fail. Looks like only the note was added as the only change. The owner of the branch reverted to previous version from history and it worked without an issue.

My understanding, merge will update the code sections that were different. Why would also update sections that weren't part of my changes? There are likely a few possibilities, but why would the merge update a code section that wasn't changed?

Scott

[Nick]

I am not sure that I am completely following. Merge will update the changesets that were selected when performing the merge in the admin. You can see all the changesets for a branch by viewing the history of the branch. If any of the changes were included in the changeset selected in the merge then it will update the branch.

[ids]

That's what I thought happened. I didn't keep track when going through the process, but I recall a list before completing the merge where the 4 sections I expected to be merged were the only ones listed.

The page that was updated had no changes in my dev branch. I'm not sure why the page would have had any change sets included. Unfortunately, I don't think there is a way for me to replicate the experience.

Scott