コンフリクト
$ git pull origin master error: Your local changes to the following files would be overwritten by merge: xxxxxxxx public/xxxxxxxx.txt Please commit your changes or stash them before you merge.Aborting 強制的にマージする # 1) リモートの最新…
$ git pull origin master error: Your local changes to the following files would be overwritten by merge: xxxxxxxx public/xxxxxxxx.txt Please commit your changes or stash them before you merge.Aborting 強制的にマージする # 1) リモートの最新…