[spam][wrong] new git history for mailman

hey I did a "git pull" in my mailman git repository recently and it said it couldn't merge cause there was no common ancestor between the trees that's kinda frustrating, could things go better than that?? anyway I tarred the folder up for possible archival of both histories