search

NYPL-Simplified / webpub-viewer

8 stars 4 forks source link

PR for edrlab (jellybooks) changes #141

Closed hokei closed 4 years ago

hokei commented 4 years ago

Getting master caught up.

EdwinGuzman commented 4 years ago

Does this PR include your latest updates? We don't want to merge into master just yet but wanted to keep development the working branch until others know what is going on. Maybe it's too late now but is there a way to do a PR from the working branch into development?

hokei commented 4 years ago

@EdwinGuzman No, this doesn't include the latest updates. I can me to close this up, push master onto development, and then make a PR from merge-edrlab-changes onto development! It will require some force-pushing, but development wasn't a branch that existed before this PR, so it should be ok...?

EdwinGuzman commented 4 years ago

Right, development didn't exist before. What did you branch off from to create development? How about you branch off master and create a develop branch, make a PR from merge-edrlab-changes to develop, and then the updates you did can be a PR into develop after that. develop can be our working branch, if development doesn't work, for a while until we are ready to merge to master for a new version. @adriana-alter what do you think?

adriana-alter commented 4 years ago

That sounds like a good plan to me!

hokei commented 4 years ago

@EdwinGuzman I had branched off merge-edrlab-changes to create development, but I've created the new PR, which works better!