Lost local updates

[Paul Boddie]

On 08/12/11 11:53, Lester Caine wrote:
>
> This is certainly 'finger trouble' and getting used to the different way
> of working, hence the question to ascertain if it is a more common
> niggle. Looking perhaps to improving 'getting started' notes to reduce
> the incidence of niggles.

You mentioned that you work with Eclipse and TortoiseHg. Do these tools 
expose the .orig files at all? When automatic merging of locally 
modified files with uncommitted changes causes conflicts, you should 
still have the local versions available as .orig files so that nothing 
actually gets lost, even though something has changed the actual files 
themselves.

It is the case that if the automatic merging succeeds, but in a way you 
don't like, your files will have changed, but you won't have the locally 
modified files as .orig files. The question then is: what kind of files 
were successfully merged and how was the merge unsatisfactory?

Paul