Switched to a new branch '20250219165722.26348-1-harirajkumar230@gmail.com' Applying: schema: Add new domain elements to support multiple throttle groups Using index info to reconstruct a base tree... M docs/formatdomain.rst M src/conf/schemas/domaincommon.rng Falling back to patching base and 3-way merge... Auto-merging src/conf/schemas/domaincommon.rng CONFLICT (content): Merge conflict in src/conf/schemas/domaincommon.rng Auto-merging docs/formatdomain.rst CONFLICT (content): Merge conflict in docs/formatdomain.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 schema: Add new domain elements to support multiple throttle groups 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".