prevent merge to workspace containing changed items
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?
5
votes
![](https://secure.gravatar.com/avatar/f6fbbdb4c8a1b0c08f5e1ccb5a8106fe?size=40&default=https%3A%2F%2Fassets.uvcdn.com%2Fpkg%2Fadmin%2Ficons%2Fuser_70-6bcf9e08938533adb9bac95c3e487cb2a6d4a32f890ca6fdc82e3072e0ea0368.png)
-
psantosl commented
Uhm... interesting point! :-)
In fact if this was the standard merging would be much simpler :-)
I'll check with the team.