There's still one conflict in the pod section of innobackupex:
176 -innobackupex --copy-back [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME] BACKUP-DIR 177 +<<<<<<< TREE 178 +innobackupex --copy-back [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME] BACKUP-DIR 179 +======= 180 +innobackupex --copy-back [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME] BACKUP-DIR 181 + --move-back [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME] BACKUP-DIR 182 +>>>>>>> MERGE-SOURCE
I would create a separate line in the help text, rather than add --move-back to the existing one describing the --copy-back synopsis, i.e.:
innobackupex --copy-back [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME] BACKUP-DIR
innobackupex --move-back [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME] BACKUP-DIR
« Back to merge proposal
There's still one conflict in the pod section of innobackupex:
176 -innobackupex --copy-back [--defaults- file=MY. CNF] [--defaults- group=GROUP- NAME] BACKUP-DIR file=MY. CNF] [--defaults- group=GROUP- NAME] BACKUP-DIR file=MY. CNF] [--defaults- group=GROUP- NAME] BACKUP-DIR file=MY. CNF] [--defaults- group=GROUP- NAME] BACKUP-DIR
177 +<<<<<<< TREE
178 +innobackupex --copy-back [--defaults-
179 +=======
180 +innobackupex --copy-back [--defaults-
181 + --move-back [--defaults-
182 +>>>>>>> MERGE-SOURCE
I would create a separate line in the help text, rather than add --move-back to the existing one describing the --copy-back synopsis, i.e.:
innobackupex --copy-back [--defaults- file=MY. CNF] [--defaults- group=GROUP- NAME] BACKUP-DIR
innobackupex --move-back [--defaults- file=MY. CNF] [--defaults- group=GROUP- NAME] BACKUP-DIR