Merging changes from parent to child branch overwrites any changes?

Is this the expected behaviour of merging from a parent branch back to a child branch. So for instance, within the ‘follow-on2’ branch, clicking the ‘Merge changes from another branch’, selecting ‘follow-on1’ then confirming the few changes, resolving any conflicts (in this case zero) and continuing…should this reset any changes to the current branch ‘follow-on2’?

image

Surely not, if not, its quite the ugly bug, as just hoping into the branch finding all the recent changes missing - so luckily restored from a autosave point just before the merge.

This topic was automatically closed after 14 days. New replies are no longer allowed.