[GRASS-dev] i.pansharpen fails to compile

[Nikos Alexandris]

Thanks Markus.

Nikos Alexandris:

>> Probably! But, I did select for "tc" --> "theirs conflict" while 
>> updating.

Markus Neteler wrote:

> This means that you keep your changes (somehow).

Reading in <http://svnbook.red-bean.com/en/1.7/svn-book.html>:

--%<---
(tc) theirs-conflict

     Discard any local changes which conflict with incoming changes from 
the server for the file under review. However, preserve all 
non-conflicting local changes to that file.
--->%--

and

- 
<http://stackoverflow.com/questions/4015864/tortoise-svn-resolve-conflict-using-theirs-what-does-it-mean>
- 
<http://tortoisesvn.net/docs/release/TortoiseMerge_en/tmerge-basics-conflicts.html>


I think its a bit confusing, happened to me in the past again.

Nikos