After marking a p4 branch as merged don't ever merge it in git again.