Merge history allows this and makes things more convenient. The workaround is simply to use a label to mark the point of your last merge.

• 合并历史就允许这样做，并且很便利。工作区里面会简单的使用一个标签来标示你上一次合并的点。