Switched to a new branch '20240913094604.269135-1-d-tatianin@yandex-team.ru'
Applying: chardev: introduce 'reconnect-ms' and deprecate 'reconnect'
Using index info to reconstruct a base tree...
M	chardev/char-socket.c
M	chardev/char.c
M	docs/about/deprecated.rst
M	include/chardev/char-socket.h
M	qapi/char.json
Falling back to patching base and 3-way merge...
Auto-merging qapi/char.json
Auto-merging docs/about/deprecated.rst
CONFLICT (content): Merge conflict in docs/about/deprecated.rst
Auto-merging chardev/char.c
Auto-merging chardev/char-socket.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chardev: introduce 'reconnect-ms' and deprecate 'reconnect'
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".