Solving some Git Problems