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
36
Help us understand the problem. What is going on with this article?
@panghea@github

stashからapplyやpopができなくなった時。

More than 5 years have passed since last update.

git stash applyやgit stash popを実行した際に、エラーが出て実行できなくなるときってありますよね?

例えば)
ブランチAで
untrackedなファイルA.txtがある状態で

git stash save -u

ブランチBで同じファイルA.txtがある状態で

git stash apply

なんてすると以下のエラーが出ます。

A.txt already exists, no checkout
Could not restore untracked files from stash

こういった場合、強制的にstash applyしたい時は以下の様にすればOK

 git merge "stash@{0}"  

そうです、stashもmerge出来るんです。
もちろんcheckoutで個別にファイルを取得することもできます。

36
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
panghea@github
Google Chromeの拡張機能Price Checkerを開発しています。 https://chrome.google.com/webstore/detail/price-checker/joppkfcpejikbcbeibcbdocmpofhipim よければ使ってみてください。

Comments

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