-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Liz #21
base: dev
Are you sure you want to change the base?
Conversation
Hi @lizita, This got away from me, sorry (I'm busier since the class has started). I added a lot of content to Chapter 5, so I hope this didn't throw too much of a wrench into the work you've done. Let me look at it soon and then comment. |
no worries - I didn't change very much, and anything I added you can overwrite. Are you pushing to the dev branch or are you updating the master? I haven't done much but I was thinking it would go like: checkout liz, pull from dev, merge, do some work, push to liz, pull request to dev....at some point later pull request dev to master. |
I'm just working on Master, since the class is live and I need changes right away. Your proposal to merge into Dev would be nice, especially if you're not building the book as you make changes. That way I can build the dev branch to look at things before merging into master. Then you get to have fun with rebasing too, if you really want too ;) |
I moved this to the dev branch - difference is importing animal crossing data.