Your local changes to the following files would be overwritten by merge: The following untracked working tree files would be overwritten by merge: この2つのエラーを対処する方法