GIT-1 #resolve resolving