[AMBER-Developers] Switching from a branch with submodules to one without

From: Daniel Roe <daniel.r.roe.gmail.com>
Date: Fri, 19 May 2017 09:15:13 -0400

Today I came across an issue when trying to switch from master (has
submodules) to amber16-with-patches (no submodules):

    error: The following untracked working tree files would be
overwritten by checkout:

Followed by tons of files. I then remembered having this issue a long
time ago and Jason coming up with the solution. Since it wasn't on the
pmwiki submodule page I added it and figured I'd share it here.

You just need to temporarily deactivate these modules in GIT:

    git submodule deinit --all

Then you should be able to switch. When you go back to the branch with
submodules remember to reactivate them:

    git submodule update --init

-Dan

_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Fri May 19 2017 - 06:30:03 PDT
Custom Search