56
42

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?

More than 5 years have passed since last update.

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

Last updated at Posted at 2015-04-30

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を削除することでエラーが消えました。

56
42
1

Register as a new user and use Qiita more conveniently

  1. You get articles that match your needs
  2. You can efficiently read back useful information
  3. You can use dark theme
What you can do with signing up
56
42

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?