マージしたい
よくUntracked working tree file '' would be overwritten by merge.
というエラーが出る。
よく使う解決方法
git add *
（それか git add -f *）
git merge origin/master
「とりあえず作業状態を一時保存（マージコミット）してプッシュ
$ git add .
$ git commit
$ git push <リモート名> <マージ作業中のブランチ名>
More than 3 years have passed since last update.
Why not register and get more from Qiita?
- We will deliver articles that match youBy following users and tags, you can catch up information on technical fields that you are interested in as a whole
- you can read useful information later efficientlyBy "stocking" the articles you like, you can search right away
Comments
No comments
Sign up for free and join this conversation.
Sign UpIf you already have a Qiita account Login
Why do not you register as a user and use Qiita more conveniently?
- We will deliver articles that match youBy following users and tags, you can catch up information on technical fields that you are interested in as a whole
- you can read useful information later efficientlyBy "stocking" the articles you like, you can search right away
ユーザーは見つかりませんでした