From f8e7ca758ac96fa03f2e3d11b6b3c6ab62e42ce7 Mon Sep 17 00:00:00 2001 From: abeaucha Date: Fri, 20 Sep 2024 14:20:25 -0400 Subject: [PATCH] comment out 1-time code --- sync_externals.csh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sync_externals.csh b/sync_externals.csh index a42a76a47..8889ae894 100755 --- a/sync_externals.csh +++ b/sync_externals.csh @@ -21,7 +21,9 @@ git remote add -m main -f nitro_remote git@github.com:mdaus/nitro.git git subtree pull --prefix externals/coda-oss coda-oss_remote main --squash git subtree pull --prefix externals/nitro nitro_remote main --squash -git rm -rf externals/nitro/externals +# git is smart, so we only have to do this once and then future subtree pulls will never +# pull these in +# git rm -rf externals/nitro/externals # If when you do this command you git a merge conflict because a file that has been removed here has been updated in CODA-OSS, you just need to do a 'git rm ' to resolve the merge conflict. Then a 'git commit'. # TODO: Make this script smart enough to do this.