On 10/08/2015 Kay Schenk wrote:
OK, I have my merge ready to commit. But should I actually commit from "main" even if I only merged to one file?
Thank you, and yes as I saw it the merge-tracking changes are considered by SVN to be changes in the directory (so in main, not in the files you committed), so committing only the file will still leave your copy not synchronized with the repository.
Regards, Andrea. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
