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 Divergent branches, do you work for the TVA?
Follow
@MakerWerks I am not at liberty to disclose that information at this point