This change isn't directly related, but I have noticed that aggressive merges can get stuck if there are generation gaps in the tree.