Switched to a new branch '20240826193040.10373-1-praveenkpaladugu@gmail.com' Applying: ch: Enable bridge network mode Using index info to reconstruct a base tree... M src/ch/ch_interface.c Falling back to patching base and 3-way merge... Auto-merging src/ch/ch_interface.c No changes -- Patch already applied. Applying: NEWS: Add an entry for network support in ch driver. Using index info to reconstruct a base tree... M NEWS.rst Falling back to patching base and 3-way merge... Auto-merging NEWS.rst CONFLICT (content): Merge conflict in NEWS.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 NEWS: Add an entry for network support in ch driver. 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".