avoid infinite looping from git when resolving fails

Change-Id: I78453c03c4db56eb846841ed94bc1c6c93a937ab
2 files changed