dang--I am encountering a lot of "you have divergent branches and need to specify how to reconcile them" from #git lately. I wonder if they changed a default setting or something to make it less tolerant..
@rpardee
I swear to gawd, when I first read that I immediately thought of Thanksgiving dinner with extended family.😂