> bzr merge lp:~mariosplivalo/charms/trusty/percona-cluster/enable-binlogs > ... > Text conflict in hooks/charmhelpers/contrib/database/mysql.py > 1 conflicts encountered.
I belive this is because of the prerequisite branch that needs merging first.
« Back to merge proposal
> bzr merge lp:~mariosplivalo/charms/trusty/percona-cluster/enable-binlogs ers/contrib/ database/ mysql.py
> ...
> Text conflict in hooks/charmhelp
> 1 conflicts encountered.
I belive this is because of the prerequisite branch that needs merging first.