FWIW: I have major problems when rebasing if that rebase runs across the point
where a submodule is added. Every file that was removed and replaced by the
submodule generates a conflict. Only solution I could find was to whack the
subdirectory containing the files-to-be-replaced and work thru it
On Feb 7, 2020, at 4:27 AM, Brice Goglin via devel
wrote:
>
> PR#7367 was initially on top of PR #7366. When Jeff merged PR#7366, I rebased
> my #7367 with git prrs and got this error:
>
> $ git prrs origin master
> From
> https://github.com/open-mpi/ompi
>
> * branch maste
Hello
I have a git submodule issue that I don't understand.
PR#7367 was initially on top of PR #7366. When Jeff merged PR#7366, I
rebased my #7367 with git prrs and got this error:
$ git prrs origin master
>From https://github.com/open-mpi/ompi
* branch master -> FETCH_HEAD
