SimCenter Forum
SimCenter Training => Programming Bootcamp => Topic started by: cwilliams0706 on August 13, 2020, 07:14:33 PM
-
I've followed the "Synching your Fork with Original" directions on the Bootcamp's website
(https://nheri-simcenter.github.io/SimCenterBootcamp2020/source/git.html#synching-your-fork-with-original (https://nheri-simcenter.github.io/SimCenterBootcamp2020/source/git.html#synching-your-fork-with-original)) but it seems like it has not updated/synched with SimCenter's github page. I cannot see the new lecture notes for web scrapping and can only see up through "09 SQL Databases.ipynb" in "presentations > Python Quickstart Tutorial > presentations".
Is there something we're supposed to do after we enter "git merge upstream/master" in the PowerShell?
Thank you,
Caroline W.
(github user: cjw0706)
-
I think your upstream should be: https://github.com/NHERI-SimCenter/SimCenterBootcamp2020.git
maybe you skipped step 5 in from the slides??
-
Hello,
I do the following commands to sync the file in GitHub. (only on MAC)
1. git status
2. git remote -v
3. git remote add upsteam (your GitHub fork from the bootcamp)
4. git remote -v (check, if the step 3 is success, you should see origin and upstream)
5. git fetch origin (downloading all the files in origin)
6. git merge upstream/master (after this step, you should get the updated doc)
If you have more problem, google is your best friend.
Enjoy the Camp.
-
Caroline
the problem is with your upstream github repo, it is the same as your origin .. in powershell issue the following:
git remote rm upstream
git remote add upstream https://github.com/NHERI-SimCenter/SimCenterBootcamp2020.git
and then go to the
git fetch upstream
git merge upstream/master
-
Great, thank you all! It's now working.