search

ebeshero / Amadis-in-Translation

a project to apply TEI markup to investigate early modern Spanish editions of Amadis de Gaula and their translations into English and French from the 1500s to the early nineteenth century.
http://amadis.newtfire.org
GNU Affero General Public License v3.0
4 stars 6 forks source link

Transcriptions of Montalvo Chapters #67

Closed msb81 closed 7 years ago

msb81 commented 7 years ago

I'm with @rjp43 and we are trying to resolve my merge conflicts.

This is @rjp43 from this point forward: We are going to nuke Madee's local repo. A big problem is that while she has been pulling in from the remote @setriplette fork she did not pull in from the main repo owned by @ebeshero. We need to get the @setriplette fork on track with the main @ebeshero remote repo so then @msb81 and @setriplette can make regular pull requests to the main @ebeshero repo as Madee continues her green scholar work of transcribing the Montalvo chapters. I have made local copies of all Madee's transcriptions and we can add those back in to the fork and issue a second pull request once we get these two remote repos aligned.

ebeshero commented 7 years ago

@rjp43 @msb81 @setriplette I believe I've resolved the merge conflict up here at my remote origin repo. What needs to happen next is: 1) that @setriplette 's fork needs to pull in the changes from the remote origin. And that Madee's local repo also pulls in all changes. 2) we review this workflow and decide whether we want to continue working in forks. We could try branches inside my repo instead, but however we proceed we need to be very clear on the workflow of how to push and pull in changes regularly.