westonpace commented on PR #13232: URL: https://github.com/apache/arrow/pull/13232#issuecomment-1144205453
From the base directory run: ``` git submodule update --init --recursive # Note, at this point you will have some staged changes that you want to commit and # some unstaged changes that you do not want to commit. So do not run `git add` git commit -m "Restored submodules" git submodule update # At this point you should have no unstaged or staged changes and the submodules should # be in sync with master ``` I'm going to try and get some time to review this in the evening and I'll update this for you if you hadn't gotten a chance to get to it by then. In the future I recommend rebasing master instead of merging master. However, that won't help avoid this situation. What happened is someone updated the submodules on master. When you merged master it did not update the submodules (submodules are just a pain to work with). I think, after you rebase/merge master, you need to run: git submodule update Otherwise, if you just stage those submodule changes and commit them it will reset the submodules back to what they were before. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
