pfefferniels / probstuecke-digital

A digital edition of the 24 Probstücke of the Oberclasse by Johann Mattheson.
http://probstuecke-digital.de
GNU General Public License v3.0
10 stars 1 forks source link

Improve data structure #41

Closed pfefferniels closed 4 years ago

pfefferniels commented 4 years ago

This rather huge (sorry for that) PR:

An instance of this branch is currently viewable here.

@rettinghaus I want to merge this as soon as possible into master, in order to avoid possible merge conflicts with your work (mostly since this is also affecting the score.mei files). I'll be happy about any comments …

rettinghaus commented 4 years ago

I moved my work on PS5 to a separate branch, so I can deal with that later. That leaves us only two conflicts (PS1 and PS2). So you should merge my PR first, then yours, and try to deal with the conflicting files. If something gets lost on the way, I think we both could reproduce our work on those files.

rettinghaus commented 4 years ago

Strange … My tests had different results.

pfefferniels commented 4 years ago

github is wrong here, I think. As predicted there are only merge conflicts in PS 1 and 2 when I merge with git directly