git pullの質問：マージする前に、変更をコミットするか、隠してください。

Git Pull Question Please

git pullを使用してコードを更新すると、次の問題が発生しました。

error: Your local changes to the following files would be overwritten by merge: xxx/xxx/xxx.java Please, commit your changes or stash them before you can merge. Aborting Solution: git stash Meaning: Back up the content of the current workspace, read the relevant content from the most recent submission, and ensure that the workspace is consistent with the content submitted last time. At the same time, save the current workspace content to the Git stack.

次に、gitpullをもう一度