git-8_Merge conflict resolve

test@etos20:[~/ers]((no branch))$merge conflict result enter no branch
$git mergetool    # run this command in VNC for merge conflict
$git rebase –continue #after problem resolved
$git rebase –skip     #skip this conflict patch
$git rebase –abort    #check out the original branch and stop rebasing