⬢ [agabor@toolbx bypass-guard-for-cloudflare]$ ./publish.sh 
Publishing version 1.0.0
sending incremental file list
./
bypass-guard-for-cloudflare.php
readme.txt
assets/
assets/css/
assets/css/bypass-guard-admin.css
assets/js/
assets/js/bypass-guard-admin.js
includes/
includes/class-bypass-guard-activator.php
includes/class-bypass-guard-logger.php
includes/class-bypass-guard-plugin.php
includes/class-bypass-guard-settings-page.php

sent 34,466 bytes  received 195 bytes  69,322.00 bytes/sec
total size is 33,649  speedup is 0.97
Copying trunk to tags/1.0.0
A         tags/1.0.0
Review the changes below, then press Enter to commit or Ctrl+C to abort.
?       .git
?       .gitignore
?       .yact
D     C assets
      >   local dir unversioned, incoming dir add upon update
?       assets/css
?       assets/js
?       bypass-guard-for-cloudflare.php
?       bypass-guard-for-cloudflare.zip
?       includes
?       pack.sh
?       readme.txt
A  +    tags/1.0.0
A       tags/1.0.0/assets
A       tags/1.0.0/assets/css
A       tags/1.0.0/assets/css/bypass-guard-admin.css
A       tags/1.0.0/assets/js
A       tags/1.0.0/assets/js/bypass-guard-admin.js
A       tags/1.0.0/bypass-guard-for-cloudflare.php
A       tags/1.0.0/includes
A       tags/1.0.0/includes/class-bypass-guard-activator.php
A       tags/1.0.0/includes/class-bypass-guard-logger.php
A       tags/1.0.0/includes/class-bypass-guard-plugin.php
A       tags/1.0.0/includes/class-bypass-guard-settings-page.php
A       tags/1.0.0/readme.txt
A       trunk/assets
A       trunk/assets/css
A       trunk/assets/css/bypass-guard-admin.css
A       trunk/assets/js
A       trunk/assets/js/bypass-guard-admin.js
A       trunk/bypass-guard-for-cloudflare.php
A       trunk/includes
A       trunk/includes/class-bypass-guard-activator.php
A       trunk/includes/class-bypass-guard-logger.php
A       trunk/includes/class-bypass-guard-plugin.php
A       trunk/includes/class-bypass-guard-settings-page.php
A       trunk/readme.txt
Summary of conflicts:
  Tree conflicts: 1

svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: '/var/home/agabor/Documents/repos/svn/bypass-guard-for-cloudflare/assets' remains in conflict

