karlstolley / 535 Goto Github PK

Okay, so I don't know if I missing something (wouldn't be surprised) or if I'm just doing it wrong (still wouldn't be surprised). I've tried it several ways but I keep getting the same result.
In my terminal I run jekyll and I'm able to view the page at http://localhost:4000/html/, however, I can only see old content, which happens to be the content from when the last pull request was approved.
I've pushed, pulled, and rebased, and still nothing. I just want to make sure my structure and css changes are rendering correctly.

Will I not be able to see my updated pages live anymore (as in on the internet) now that we've moved over to using yaml? Will I not be able to see anything until the pull requests go through?

How does everybody else see their latest content live?

If anybody has any ideas I would greatly appreciate you sharing them.

Current Ruby repo: https://github.com/atsansone/535/tree/dev

Still working on it. Should have things unplumbed by tomorrow. Sorry for the delay.

Sorry to be a bother but I tried doing a new pull request but it won't let me because I already have one in queue. Is it possible to take it back so I could do a new one, or do I have to wait until this existing one is accepted?

Sorry, forgot to do this yesterday--I'm still getting the hang of working in a Git team.

https://github.com/camcclure/535/tree/dev

Hi All,

Great to see that you're trying to work on one another's branches. As most of you have discovered, you can't fork someone else's fork. But that step's not necessary.

If, for example, you wanted to work on Khalila's materials, you would do this in your repo:

$ git remote add khalila git://github.com/kchughes/535.git

That adds Khalila's repository as a remote that yours can pull from. To make your repository aware of Khalila's branches, run:

$ git fetch khalila

You'll see a bunch of output that concludes with some lines that look like:

 * [new branch]      dev        -> khalila/dev
 * [new branch]      gh-pages   -> khalila/gh-pages
 * [new branch]      master     -> khalila/master

Next, check out & create a new branch that uses Khalila's dev branch:

$ git checkout -b khalila-dev khalila/dev

You'll then make your adjustments & add and commit files as normal; when you're ready to share your work with Khalila, you push the khalila-dev branch to your remote:

$ git push origin khalila-dev

Now, go to GitHub and find your 535 repo, select your khalila-dev branch from the list of branches, and click on the Pull Request button.

On the resulting screen, where you see the base repo: dropdown, you'll choose Khalila's (kchughes/535') and then herdevbranch from the **base branch:** dropdown (note that you will see the list of everyone in our class). Make sure that your head reop/branch are correct (esp. the branch,khalila-dev). Khalila will then get a pull request to her repository that she can choose to merge, ignore, or converse with you to work further. For example, if she's made more commits and can't do a clean merge, she might ask you to pull or rebase from herdev` branch again.

Hope that helps. (And apologies to Khalila for using your name like a thousand times in this post.)

Suggestions...let's hear them.

I submitted a pull request from my dev branch onto the main dev branch (instead of master). Karl: do you need to reject this and have me resubmit to the dev branch? Or can you do some magic so that it's merged correctly into the master?

Just started tossing some ideas around. I was thinking that we could have predominantly light background/dark text with each chapter using a different color in the header bar: something like a spectrum, but more muted colors to avoid eye strain.

Colourlovers.com is one of my favorite sites to get color inspiration from. Here are a couple of palettes that I thought might work well.

http://www.colourlovers.com/palette/48747/hippie_dippy
http://www.colourlovers.com/palette/1664634/My_Favorite_Spectrum

This one's a bit too bright; I just love the name:
http://www.colourlovers.com/palette/1930/cheer_up_emo_kid

Since we don't have class next week, maybe we can resolve this tonight (as well as the title). I have a final section titles "Try It Yourself" where I reference the "project," with a note to check it later.

Content

• Welcome to IARC/TCID students on home page

• Explanation of the sections, why they were chosen

• [Tony] Remove numbers from file names (dude)

• Concluding sections:

  • What did I learn?
  • Further reading (recommended sites, books, etc.)

• Concluding/recurring section: "Test your knowledge" (depending on what fits with your section)

• Add next:, previous:, and progress: (for percentage) to YAML?

      prev: page-before.html
      next: next-page.html
      progress: 20
  

• What do put for prev on the first page, and next on the last? Just /?

• Add previous/next buttons and complete/progress to _layouts/page.html

• Individual areas (HTML, CSS, JavaScript) are chapters; individual pages within chapters are section

• Glossary: Make a list of terms for your section; we'll look at the total list on 11/27

Design

• Put unique IDs on <a> tags inside of <li>s in the navigation includes file
• Figure out a way to add unique IDs to each page? Something in the YAML?
• Drop hero units on individual pages (class="hero-unit")

https://github.com/matthewheston/535

Could someone refresh my memory on how to rebase? I forgot to write down the steps the last time we were in class so now i'm doing it off of memory. I remember the general steps just not the order.

1. git push dev origin
2. git checkout -master
3. git pull karl master

Please let me know if i'm totally off (i wouldn't be surprised). I'm probably missing a step or two.
Also, it won't let me push for some reason. I keep getting an error message.

I've made a lot of changes (40 commits and counting) that I'd like to share.