- there are now "SVN conflict" helper tools (right click on conflicted file). It is nothing spectacular, just opens comparisons of related files and is able to overwrite current file with "mine" or "theirs"
- there is now a command that removed DDUMP, DLOG etc.. (temporary debug log) lines from the file. In editor context menu or Assist menu.
Klugier Messages: 1076 Registered: September 2012 Location: Poland, Kraków
Senior Contributor
Hello,
Quote:
- there is now a command that removed DDUMP, DLOG etc.. (temporary debug log) lines from the file. In editor context menu or Assist menu.
When U++ is not building, the main cause of it is that somebody (usually Mirek) forgets to remove DDUMP. This is not even easier that before This will be good announcement for "April Fool's Day"
Backing to SVN, does it also works with GIT or it is only SVN orientated. Currently, I use Android Studio to resolve serious conflicts in GIT. It works quite fine, but the biggest pain is that I need to launch this app whenever I need to do it - good alternative always included especially that written in U++.