結果 : git resolve stash conflict without commit