Usually I would not like to group changes from a merge (rebase) with those from editing files (development). I would like to be prevented from making this mistake and checking it in before realising.

There is already a similar option when switching/updating the workspace: "Do not allow, show an error". Could it be extended to cover merges, or a new option added?