Check week (1 and) 2 - Githubissues

Yfke commented 8 years ago

I've uploaded all of our files to the new repo. Maybe a slight overkill, but let's use the dev/staging/production structure, where we generally keep three branches active:

Master (production): the one that the students can see, which contains only the completely finished chapters. Only hotfixes (typos, small errors) on this branch. It also contains the published homework sets.
Staging: parts that are ready for review: all the content is there, but there might be errors / structural changes / additions, and there are still comments visible in the pdf.
Development: where I/we work on new chapters. This is a separate branch so that the staging branch can quickly be pushed to production.

Right now I have put week 1 on production. I think you checked most of that already, but maybe you can still check out section 1.8 on relative entropy.

Week 2 is in staging: generally all of the content is there but it still needs to be checked.

PS week 2 is actually 1.5 week worth of content. Maybe we should rename it back to "Chapter" to avoid confusion?

cschaffner commented 8 years ago

Cool, yes, switching to Chapters instead of Weeks seems very sensible to me. I've moved the files to a subdirectory, and I've added some license information. I've also updated the dev and staging branches with these changes, I hope it worked... I'll have a closer look at the content over the weekend.

Yfke commented 8 years ago

Also a very important task for during the weekend: enjoy your weekend! :sleeping:

cschaffner commented 8 years ago

So I made some final changes in Chapter 1 (i.e. renamed things to Chapter). How do I merge this now into Master without revealing Chapter 2? Some git wizardry required here?

cschaffner commented 8 years ago

I guess I should simply check Chapter 2 as well. I'm working on it now.

Yfke commented 8 years ago

If the only changes you made are outside of the InfTheory3.tex file (which decided which chapters and comments are included), then you could switch to master and use (e.g.) git checkout staging --patch week_1_content.tex to change the content of only that file to the head of the staging branch. Then you still need to (add and?) commit.

Yfke commented 8 years ago

From now on I'll put all comments in the week_N_content files to maximize the probability of having no changes to the InfTheory3.tex file 😉

cschaffner / InformationTheory

Check week (1 and) 2 #1