This paper investigates the impact of climate shocks on violence between herders and farmers by using geolocalized data on conflict events for all African countries over the 1997-2014 period. We find that a +1℃ increase in temperature leads to a +54% increase in conflict probability in mixed areas populated by both farmers and herders, compared to +17% increase in non-mixed areas. This result is robust to controlling for the interaction between temperature and ethnic polarization, alternative estimation techniques, disaggregation levels, and coding options of the climatic/conflict/ethnic variables. When quantifying at the continental level the impact on conflict of projected climate change in 2040, we find that, in absence of mixed population areas, global warming is predicted to increase total annual conflicts by about a quarter in whole Africa; when factoring in the magnifying effect of mixed settlements, total annual conflicts are predicted to rise by as much as a third. We also provide two pieces of evidence that resource competition is a major driver of farmer-herder violence. Firstly, conflicts are much more prevalent at the fringe between rangeland and farmland - a geographic buffer of mixed usage that is suitable for both cattle herding and farming but is particularly vulnerable to climate shocks. Secondly, information on groups' mobility reveals that temperature spikes in the ethnic homeland of a nomadic group tend to diffuse its fighting operations outside its homeland, with a magnified spatial spread in the case of conflicts over resources. Finally, we show that violence is substantially reduced in the presence of policies that empower local communities, foster participatory democracy, enforce property rights and regulate land dispute resolution.