[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Git help requested: "git stash pop" is doing an unwanted "git add".
|
From: |
Renaud Casenave-Péré |
|
Subject: |
Re: Git help requested: "git stash pop" is doing an unwanted "git add". Why? |
|
Date: |
Tue, 22 Dec 2015 17:11:44 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (windows-nt) |
In my experience, if some files are in conflict, git will add to index all
non-conflicting files to clearly separate the conflicting ones.
You are then expected to resolve the conflicts, stage the files to tell git to
accept the resolved files, and do a git reset to put everything back in the
working area.
I think this is something that is not (properly) documented and quite confusing
but when you know what to do, you get used to it…
--
Renaud Casenave-Péré