|
From: | Stefan Monnier |
Subject: | bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file |
Date: | Wed, 13 May 2015 23:49:25 -0400 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> is better than it was before the change. Also note that conflicts > like this are quite rare, It's about 99.9% of my "unstash-caused conflicts", so "rare" obviously depends on how you use Git. Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |