此问题在此处已有答案:
Git merge left HEAD marks in my files(6个答案)
16天前关闭。
为什么“〈〈〈〈〈〈〈〈HEAD”出现在我的R脚本中?
我想这是指Git Head,但我不明白它为什么要把自己插入到我的代码中。
有什么办法可以防止这种情况发生吗?
AllAlliancePerformance <- Tab_PercentCompliant %>%
filter(ClaimsAdjudicatedThrough == VBP_Report_Date) %>%
group_by(SubMeasureID) %>%
summarise(Sum_AdaptedCompliant = sum(AdaptedCompliant, na.rm = FALSE),
Sum_TotalEligible = sum(TotalEligible, na.rm = FALSE)) %>%
mutate(Percent_Compliant = Sum_AdaptedCompliant/Sum_TotalEligible) %>%
<<<<<<< HEAD
mutate(NCQA_Mean = NCQA_MeanList) %>%
mutate(PerformanceLevel = (Percent_Compliant - NCQA_Mean))
=======
#mutate(NCQA_Mean = Tab_PercentCompliant$AdaptedNCQAMean) %>%
mutate(PerformanceLevel = (Percent_Compliant - AdaptedNCQAMean))
>>>>>>> 90d29b1de468129cce7530d84a5f7771c33a74c6
1条答案
按热度按时间dpiehjr41#
以“〈〈〈〈〈〈",“======”和“〉〉〉〉〉”开始的行是
diff
标记。很可能您的分支中存在合并冲突。执行git status
查找,如果是,解决合并冲突(编辑文件,选择正确的修复),然后git添加它(忽略或取消),并允许合并完成。