Fixing some strange branching problems in git