Skip to content

Commit

Permalink
cpp17 branches
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Smith authored and Dan Smith committed Aug 3, 2023
1 parent 055bb9b commit f631341
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sync_externals.csh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ git remote add -m main -f nitro_remote [email protected]:mdaus/nitro.git

# Now we just want to update
# Here I'm assuming you're running this on the master branch... otherwise the push command should change
git subtree pull --prefix externals/coda-oss coda-oss_remote main --squash
git subtree pull --prefix externals/coda-oss coda-oss_remote cpp17 --squash

git subtree pull --prefix externals/nitro nitro_remote main --squash
git subtree pull --prefix externals/nitro nitro_remote cpp17 --squash
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'.
Expand Down

0 comments on commit f631341

Please sign in to comment.