LoginSignup
1
1

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 3 years have passed since last update.

@Toshi_Tab(toshi)

【Xcode】the working copy has conflicting, uncommitted changes エラー

Last updated at Posted at 2022-03-02

Xcodeでブランチ切り替えようとしたら以下のエラーが出た。
しかし、git statusを叩くと問題なさそう。

ってのに遭遇した。どうやったら直ったかを参考までに書いとこうかなと！

Screen Shot 2022-03-02 at 15.02.41.png

Screen Shot 2022-03-02 at 17.23.30.png

やったこと

コマンドでgit checkout ~~~でブランチ切り替える

再度Xcodeで作業してみるとエラーでなくなった

以上！！

ちなみに、強制pullしたり、PC再起動したりしてもエラーは消えなかった

1
1
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
Sign upLogin
1
1

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?