Qiita Teams that are logged in
You are not logged in to any team

Log in to Qiita Team
Community
OrganizationAdvent CalendarQiitadon (β)
Service
Qiita JobsQiita ZineQiita Blog
38
Help us understand the problem. What is going on with this article?
@pugiemonn

git pullしたときにerror: The following untracked working tree files would be overwritten by merge とエラーがでる解決方法

More than 5 years have passed since last update.

Githubにあるリポジトリから git pull をしたらエラーがでてpullが失敗しました。

pullするとエラー
git pull origin master

From github.com:pugiemonn
 * branch            master -> FETCH_HEAD
Updating 0801352..065ef52
error: The following untracked working tree files would be overwritten by merge:
    hoge.html
Please move or remove them before you can merge.
Aborting

これはhoge.htmlをgitで管理していなかったため発生したようです。マージする前にhoge.htmlを移動するか取り除けと言われています。

hoge.htmlファイルは消しても問題無いファイルでしたので、hoge.htmlを削除することでエラーが消えました。

38
Help us understand the problem. What is going on with this article?
Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away
pugiemonn
GoogleTagManagerを利用してGAを操るようなマーケターとしてお仕事しています
pugiemonn_com
pugiemonn.com

Comments

No comments
Sign up for free and join this conversation.
Sign Up
If you already have a Qiita account Login
38
Help us understand the problem. What is going on with this article?