Skip to content

Commit

Permalink
comment out 1-time code
Browse files Browse the repository at this point in the history
  • Loading branch information
abeaucha committed Sep 20, 2024
1 parent 88b48a1 commit f8e7ca7
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion sync_externals.csh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ git remote add -m main -f nitro_remote [email protected]: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 <pathname>' to resolve the merge conflict. Then a 'git commit'.
# TODO: Make this script smart enough to do this.
Expand Down

0 comments on commit f8e7ca7

Please sign in to comment.