search

USCDataScience / polar.usc.edu

Polar USC activities related to NSF Polar CyberInfrastructure program at the University of Southern California
http://polar.usc.edu/
Apache License 2.0
15 stars 35 forks source link

team26 visualizations for assn3 #158

Closed briancohn closed 8 years ago

chrismattmann commented 8 years ago

getting closer @bcohn12 I still get merge conflicts. Can you try and git pull and resolve them locally and then push to usc-bbdl:gh-pages so this PR is updated?

briancohn commented 8 years ago

From my forked repo what command can I use to pull in the most updated version of your polar repo?

chrismattmann commented 8 years ago

hi @bcohn12 from your forked repo, best bet is to do this:

git pull https://github.com/USCDataScience/polar.usc.edu

That should force a local merge (with conflicts) and tell you which flies conflict. Go into them and look for HEAD messages and messages that show you the conflict inline with the text. Resolve them. Then git add && git commit those files, then git push -u usc-bbdl gh-pages and this PR should be updated.

briancohn commented 8 years ago

Instructions worked great! Fixed everything! GitHub says it'll merge cleanly

aalavandhan commented 8 years ago

Moving to https://github.com/USCDataScience/polar.usc.edu/pull/171