Oh, one more thing, something about UDD or quilt caused two conflicts when you try to merge this into lp:ubuntu/saucy/couchdb:
conflicts: Text conflict in bin/couchdb.tpl.in Text conflict in etc/init/couchdb.tpl.in
They can be correctly resolved with:
bzr resolve --all --take-other
« Back to merge proposal
Oh, one more thing, something about UDD or quilt caused two conflicts when you try to merge this into lp:ubuntu/saucy/couchdb:
conflicts: couchdb. tpl.in
Text conflict in bin/couchdb.tpl.in
Text conflict in etc/init/
They can be correctly resolved with:
bzr resolve --all --take-other