These are chat archives for cltk/cltk

8th
Oct 2016
Jack Duff
@j-duff
Oct 08 2016 18:17
@kylepjohnson About to make the PR for the phonology module, which I’ve been working on in a branch off of my remote, ipa. Following the workflow you shared, I pulled to remote but ipa is still a bunch of commits behind. In other projects I’ve worked on this was a-ok but wanted to make sure you don’t also need ipa to be fully up to date, and that I’m cool making the PR from my ipa and not merging it into my remote first and making the PR from that?
Kyle P. Johnson
@kylepjohnson
Oct 08 2016 18:20
so the code you want is working locally on ipa?
Jack Duff
@j-duff
Oct 08 2016 18:20
yep!
Kyle P. Johnson
@kylepjohnson
Oct 08 2016 18:20
Ok. Then have you checked out master locally, then done git merge ipa?
Jack Duff
@j-duff
Oct 08 2016 18:21
Nope, haven’t merged at all, that was where my question was, but I can!
Kyle P. Johnson
@kylepjohnson
Oct 08 2016 18:22
yes, so do git checkout master and then git merge ipa.
lmk how this goes
Jack Duff
@j-duff
Oct 08 2016 18:24
all good, no conflicts! (besides me fumbling around with vim for a second ha)
Kyle P. Johnson
@kylepjohnson
Oct 08 2016 18:26
nice!
so now git pull origin master (should be ok) and then git pull upstream master (might be some conflicts!)
let's switch to dm and you can paste those errors