v2 and master branch issue

moderndive / ModernDive_book

Statistical Inference via Data Science: A ModernDive into R and the Tidyverse

https://www.moderndive.com/

Other

759 stars 491 forks source link

v2 and master branch issue #440

Closed rudeboybert closed 2 years ago

rudeboybert commented 2 years ago

No longer have

master -> moderndive.com
v2 -> moderndive.netlify.app (which we need to keep for legacy reasons)

rather

have master and v2 have same content, and moderndive.com and moderndive.netlify.app read from the same branch
process: make changes in v2 then merge into master to keep track of changes

rudeboybert commented 2 years ago

Hey @ismayc what was the reason for the new proposed process: "make changes in v2 then merge into master to keep track of changes"? I can't remember what we discussed

Why not just make all changes in master and get rid of v2 branch altogether?

We would still need to ensure that moderndive.com and moderndive.netlify.app read from the same branch b/c there may be people out there who are still using the latter.

ismayc commented 2 years ago

I think commit history on master should be fine. I just like being able to review changes and a PR does that in batch nicely.

rudeboybert commented 2 years ago

Ok what we can do is only make changes to master via PR either 1) informally or 2) formally by locking master

ismayc commented 2 years ago

Informally is fine. I don't need to review small changes/typos and I want you to be able to fix things without waiting for me if needed.