search

phoible / dev

PHOIBLE data and development.
https://phoible.org/
GNU General Public License v3.0
121 stars 30 forks source link

WIP: on issue #232 #234

Closed bambooforest closed 5 years ago

drammock commented 5 years ago

This is going to need a rebase, which can be a nightmare with binary files. Suggestion:

# start over with a new branch that's a clean copy of master
git checkout master
git merge upstream/master
git checkout -b prenasalization
# copy over just the changes to the raw file:
git checkout --patch origin/issue#232 raw-data/EA/EA_IPA_correspondences.tsv
# make whatever other changes necessary, then rerun the aggregation

then make a new PR with that branch and close this PR

bambooforest commented 5 years ago

Ugh. Maybe better to just re-create the PR.