search

uwcse440 / web-cse440-au15

1 stars 14 forks source link

Poliscope #147

Closed jgao26 closed 8 years ago

jgao26 commented 8 years ago

pull request from feature branch?

jayfo commented 8 years ago

Check out the network graph:

https://github.com/uwcse440/web-cse440-au15/network

download 1

You have you own master. That's bad. You want to get your master back to the master. Your already have a feature branch poliscope that will "hold your place" with the work you've done:

git checkout master
git reset --hard uwcse440/master
git push -f

Given that your feature branch is already coming off our current master, I think that's all you need to do. This branch should merge fine, but you'll have trouble later if you don't fix your master.

jayfo commented 8 years ago

Looks like your master rejoined when I merged.

download 2

jgao26 commented 8 years ago

I think I finished the issue of the master branch on my computer, but looking at the cse440 projects page for poliscope our site now looks like a combination of the initial website and the reworked one I'm trying to push. Is that because of the merge earlier and it didn't cleanly combine the code, or does this mean our site just isn't working?

jgao26 commented 8 years ago

fixed the issue*

jayfo commented 8 years ago

The pull you sent (this one), is now merged.

Did you refresh your browser, in case it's caching your CSS?

Without knowing what's "missing", I'm not sure what else to say here. Nothing I can see says things failed to merge. Your pull seemed fine. If something got overwritten, it would have been on your machine when your master was ahead. But I'm not sure how, especially since your files are separated from everybody else's (i.e., in your directory).