Emotion can influence conflict adaptation, which is considered as an important manifestation of the interaction between emotion and cognitive control. Although a large number of studies have focused on exploring the influence of emotion on conflict adaptation, they have not reached a consistent conclusion. This may be because emotion itself is a complex variable, there are many ways of description, existence and inducement, but previous studies have neglected the strict control of emotional variables. Therefore, this paper reviews the behavioral studies and neural mechanisms of the effect of emotion on conflict adaptation in the past decade, and concludes that the main controversial points in the research are the division of emotional states, the way of emotion induction and the choice of conflict task paradigm. Future research can further strengthen the control of emotional variables, explore how emotional subcomponents affect conflict adaptation under different valence, and constantly improve and enrich the existing theoretical basis and neural mechanism.