search

UCSBCarpentry / 2019-04-11-UCSB-SW-Workshop

https://ucsbcarpentry.github.io/2019-04-11-UCSB-SW-Workshop/
Other
0 stars 0 forks source link

git branches & deploying issue #3

Closed ilessing closed 5 years ago

ilessing commented 5 years ago

while troubleshooting issue #1 I found that we've ben making changes on two different branches of this repository. We haven't really delved into the whole topic of git branches yet because it can get confusing.

But for this issue know that Github deploys changes from the gh-pages branch to our website at: https://ucsbcarpentry.github.io/2019-04-11-UCSB-SW-Workshop/ Github ONLY deploys from that branch.
So changes you make to the master branch will NOT show up on the website.

I will next attempt to merge the two branches.

@sharonwsolis @fishymary @jonjab @dwangywu @gjanee

ilessing commented 5 years ago

after resolving one conflict the merge worked.