search

syntax-prosody-ot / main

A webapp for the syntax-prosody analyst working in Optimality Theory, with automated Gen, Con and Eval. Download build files from syntax-prosody-ot/build
https://spot.sites.ucsc.edu/
GNU General Public License v2.0
12 stars 2 forks source link

Chamorro clitic analysis #505

Closed jbellik closed 3 years ago

jbellik commented 3 years ago

Richard, which version of the Chamorro files is the most recent? I am trying to clean up our huge collection of branches and would like to merge and delete this one.

jbellik commented 3 years ago

I can't just merge them as is bc there are apparently conflicts between the versions in master and the versions on the branch.

rbibbs commented 3 years ago

The most up to date versions of the Chamorro anlaysis files are in the master branch, so you can feel free to get rid of the ones in the clitic analysis branch

jbellik commented 3 years ago

Great, thanks!

On Tue, Nov 10, 2020 at 11:23 AM rbibbs notifications@github.com wrote:

The most up to date versions of the Chamorro anlaysis files are in the master branch, so you can feel free to get rid of the ones in the clitic analysis branch

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/syntax-prosody-ot/main/pull/505#issuecomment-724914168, or unsubscribe https://github.com/notifications/unsubscribe-auth/AC7ROKQR7GPKVRDDMDXUVVLSPGHKNANCNFSM4TRBBZBA .

--

-- Jennifer Bellik, PhD Post-doctoral researcher & lecturer UC Santa Cruz https://people.ucsc.edu/~jbellik/