search

thegetty / rococo

"Rococo Ébénisterie in the J. Paul Getty Museum," by Gillian Wilson and Philippe Halbert
https://www.getty.edu/publications/rococo/
0 stars 0 forks source link

First pages rb edits #38

Closed rabarth1 closed 4 years ago

rabarth1 commented 4 years ago

Edits to front matter, intro, and cat. 1. Edits to front matter will also need to be done manually by GA to epub file. GA to manually figure out adding "with" in contributor initials at the end of technical descriptions in cat. entries.

geealbers commented 4 years ago

@rabarth1 it looks like you've made changes to quite a few catalogue entries (1, 4, 6, 7, 8, 15, and 17) but aren't those assigned to others? If they're making changes in those entries too, we're going to have a bunch of merge conflicts to deal with when they submit their pull requests.

rabarth1 commented 4 years ago

@rabarth1 it looks like you've made changes to quite a few catalogue entries (1, 4, 6, 7, 8, 15, and 17) but aren't those assigned to others? If they're making changes in those entries too, we're going to have a bunch of merge conflicts to deal with when they submit their pull requests.

These are for global changes that affect those entries; I noted these changes for myself in earlier pages. Why would that create conflicts? Those changes were noted in their pages too for the most part, so they'll just see that the change is already made when they get to the edits in question.

geealbers commented 4 years ago

Unfortunately, the issue is that they're likely already working in their own branches that don't have your changes. They're going to make changes in their versions of those files and when we go to merge them, they won't match up with your versions of the files, and we'll have to manually fix things.

Then again though, maybe not everyone is that far in. Let me ping them on Slack.

rabarth1 commented 4 years ago

Unfortunately, the issue is that they're likely already working in their own branches that don't have your changes. They're going to make changes in their versions of those files and when we go to merge them, they won't match up with your versions of the files, and we'll have to manually fix things.

Then again though, maybe not everyone is that far in. Let me ping them on Slack.

Oh ok, yeah, sorry. I won't do any more global changes for the time being. Let's talk on Slack for now about this and how to manage other global changes they come across. I think also, once everyone is done, I should be the last one to make edits before turning over the pages to you, because Anne-Lise got back to me with some of the queries the proofreader had, and those range across the whole book. Also, if Arlen by some miracle gets back to me on the rest of those queries today or tomorrow, I'll want to get those corrections into this round so that second pages are as clean as they can be.