Re: Git automatic stashing?

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Nov 9, 2010, 07:49 UTC
Message-ID: <vpqlj53j5rv.fsf@bauges.imag.fr>
In-Reply-To: <AANLkTinwftXiZxbs_=PeM-MxQmMF4VaBCPEufH=OG6iU@mail.gmail.com>

Casey McGinty <casey.mcginty@gmail.com> writes:

> Is there any feature in git to perform and auto stash apply/pop when
> trying to do a merge/rebase in a dirty working dir? This would save
> some keystrokes from time-to-time, and make it easier for new users
> unfamiliar with git.

I agree with the keystrokes part, but not with the fact that it would make it easier in general. In the sequence

git stash git merge git stash pop

conflicts can occur in 2 distinct places. One can easily forsee this senario occuring:

git stash git merge # fix conflicts # git commit # forget to do the action needed to get the "git stash pop"

and voila, you've just lost data.

Actually, what I'd like to see would be this feature, but limited to the case where the merge is a fast-forward, because then, only the last action of the sequence could possibly leave conflict, so Git could finish with a message like "please fix conflicts and continue working". Actually, this is not far from what "git checout -m" is doing.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/