I guess nobody ever uses these newer/older buttons (timestamps are unreliable), so there might well be bugs in there. If you actually wanted to apply "keep" to all conflicts that's what the "rest remote" button does ... ("keep rest" would surely be a better wording).
But I have rest local and rest remote....So I guess that it should be rest remote?
By the way what is source same but rev changed.....
What is rev? revision? What is a revision? ....uhhhhh
It means the method has a different timestamp but the source code did not change. This happens, for example, when you insert a "self halt" while debugging and then delete the line instead of reverting to the previous version.
ok I see. mainly recompiling the method.