関連ワード:  git merge reverted changes    git get reverted changes back    git discard merge changes  
結果 : git merge reverted changes