The Notification Cooldown under Settings specifies how much time must pass between two warnings. Default is 10000 ms, which is 10 s.
Git merges by comparing lines. When two branches both add code to the same file — even to completely different functions — Git sees overlapping line ranges and declares a conflict:
，这一点在PDF资料中也有详细论述
Please, for the love of Glob, stop using grey text. And especially do not use grey text on an off-white background. It doesn’t make you look more “design-ey”, it makes you look inept.，详情可参考爱思助手下载最新版本
code += "for (Entry e : aggregationMap) {";