'This method verifies if the repository is in conflict and resolved it
by performing a reset() to the previous commit-id.
:param reset_commit_id: The commit id to reset to
@raise GitClientError: To let the user know that the update failed'

def handle_conflicts(self, reset_commit_id):

    if repo_has_conflicts():
        self.reset_to_previous_state(reset_commit_id)
        raise GitClientError('A    merge    conflict    was    generated    while    trying    to    update    to    the    latest    w3af    version,    please    update    manually    by    using    a    git    client.')
