Switched to a new branch '20181128144459.11009-1-pbonzini@redhat.com'
Applying: models: avoid IntegrityError when clearing log property
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	api/models.py
Falling back to patching base and 3-way merge...
Auto-merging api/models.py
CONFLICT (content): Merge conflict in api/models.py
Patch failed at 0001 models: avoid IntegrityError when clearing log property
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".
Failed to apply patch:
[Patchew-devel] [PATCH] models: avoid IntegrityError when clearing log property