Solving problems before and after git push