Finally fixing the git incompatibility problem