Applying: Update bookinfo images
Using index info to reconstruct a base tree...
M	samples/bookinfo/platform/kube/bookinfo-db.yaml
M	samples/bookinfo/platform/kube/bookinfo-details-v2.yaml
M	samples/bookinfo/platform/kube/bookinfo-details.yaml
M	samples/bookinfo/platform/kube/bookinfo-mysql.yaml
M	samples/bookinfo/platform/kube/bookinfo-ratings-v2-mysql-vm.yaml
M	samples/bookinfo/platform/kube/bookinfo-ratings-v2-mysql.yaml
M	samples/bookinfo/platform/kube/bookinfo-ratings-v2.yaml
M	samples/bookinfo/platform/kube/bookinfo-ratings.yaml
M	samples/bookinfo/platform/kube/bookinfo-reviews-v2.yaml
M	samples/bookinfo/platform/kube/bookinfo.yaml
Falling back to patching base and 3-way merge...
Auto-merging samples/bookinfo/platform/kube/bookinfo.yaml
CONFLICT (content): Merge conflict in samples/bookinfo/platform/kube/bookinfo.yaml
Auto-merging samples/bookinfo/platform/kube/bookinfo-reviews-v2.yaml
CONFLICT (content): Merge conflict in samples/bookinfo/platform/kube/bookinfo-reviews-v2.yaml
Auto-merging samples/bookinfo/platform/kube/bookinfo-ratings.yaml
CONFLICT (content): Merge conflict in samples/bookinfo/platform/kube/bookinfo-ratings.yaml
Auto-merging samples/bookinfo/platform/kube/bookinfo-ratings-v2.yaml
CONFLICT (content): Merge conflict in samples/bookinfo/platform/kube/bookinfo-ratings-v2.yaml
Auto-merging samples/bookinfo/platform/kube/bookinfo-ratings-v2-mysql.yaml
CONFLICT (content): Merge conflict in samples/bookinfo/platform/kube/bookinfo-ratings-v2-mysql.yaml
Auto-merging samples/bookinfo/platform/kube/bookinfo-ratings-v2-mysql-vm.yaml
CONFLICT (content): Merge conflict in samples/bookinfo/platform/kube/bookinfo-ratings-v2-mysql-vm.yaml
Auto-merging samples/bookinfo/platform/kube/bookinfo-mysql.yaml
CONFLICT (content): Merge conflict in samples/bookinfo/platform/kube/bookinfo-mysql.yaml
Auto-merging samples/bookinfo/platform/kube/bookinfo-details.yaml
CONFLICT (content): Merge conflict in samples/bookinfo/platform/kube/bookinfo-details.yaml
Auto-merging samples/bookinfo/platform/kube/bookinfo-details-v2.yaml
CONFLICT (content): Merge conflict in samples/bookinfo/platform/kube/bookinfo-details-v2.yaml
Auto-merging samples/bookinfo/platform/kube/bookinfo-db.yaml
CONFLICT (content): Merge conflict in samples/bookinfo/platform/kube/bookinfo-db.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update bookinfo images
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".