Closed ebeshero closed 7 years ago
@raffazizzi I just merged the SGA-notebooks files into the ebb branch, so they're now together with the new collation I ran just before we left for dinner! I went ahead and deleted the origin/origin/ebb branch afterwards.
I just git pulled so far so good
On Tue, May 30, 2017 at 10:18 PM, Elisa Beshero-Bondar < notifications@github.com> wrote:
@raffazizzi https://github.com/raffazizzi I just merged the SGA-notebooks files into the ebb branch, so they're now together with the new collation I ran just before we left for dinner! I went ahead and deleted the origin/origin/ebb branch afterwards.
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/ebeshero/Pittsburgh_Frankenstein/pull/22#issuecomment-305062998, or mute the thread https://github.com/notifications/unsubscribe-auth/ASoxxvt8i2aDb0NZucB9otKcbclsUhA1ks5r_M3cgaJpZM4NrElx .
Hi @Rikkm If you're curious, try pulling in the ebb branch and take a peek at the new stuff--but don't merge it with Text_Processing just yet. I've re-run the collation today to strip out our comments, and that meant re-processing how they appear in the source XML files, too. I want to wait to merge all the edits into Text_Processing until I've finished my part in our round of proof-checking. Meanwhile @raffazizzi has contributed a version of some SGA notebook files that will need a bit of re-shaping before we can fold them into the collation! (Actually, we may need to re-align the collation chunks when we get to the stage of adding more of them...) I'm working on my conference talk now (for Thursday--eeek!) but my slides will tell something of what we've been working on--and update the story of our edition work from where you and I left off last week!
merging @raffazizzi 's parallel universe origin/origin/ebb branch into the ebb branch 👍