git checkout --theirs cpp_lib
git add cpp_lib
git rebase --continue

1. Reset the submodule reference to the upstream version

    git checkout --theirs cpp_lib
   

2. Mark the conflict as resolved

    git add cpp_lib
   

3. Continue the rebase

    git rebase --continue