resolves #123 smarter git-sync continue

@kevgo please review
This scenario has the same name as the next one. I suggest you call this one `continuing after just resolving the conflicts`