On 01/19/2012 07:51 PM, Eli Barzilay wrote:
I've lost a bunch of little bits of work here and there in the past,
and now that I lost a more substantial bit I finally sat down to find
the guilty party -- which turned out to be magit.
It's probably best to explain what I do:
* Open some file, work on it.
* Do a pull to get my repo updated, find that the git doesn't like
the file with the edits there.
* Run a git checkout on the file, re-run the pull.
* rm the file, save the buffer that still holds my edited version.
Yes I agree with you, this should not be the default behaviour.
But how is it possible that it just reverted the buffers (which were
modified)
without even asking you for confirmation?
Are you sure you have default settings about that?
In particular revert-without-query is by default nil on my machine..
And in general I never followed this workflow, for me it's much easier
to modify
directly the conflicted file, fixing the conflicts by hand, and I never
had a problem
with that...
