Tried fixing drugs.yml again.

[virtadpt]

Okay. I've done some tinkering on my local copy of the drugs-fixed/ branch, and I think this is a cleaner merge. Could you take a look at it, and if it's still bad I might need some help fixing it (because Git claims everything's fine on my end and there is no conflict, even after a git fetch upstream).

[vkosuri]

@virtadpt This branch has conflicts that must be resolved

[gunthercox]

I've noticed that even after you push up a merge commit (I recommend doing a rebase instead of this month) your branch is still out of date. This leads me to believe that the master branch on your fork of this repository is out of date with the master branch of the main repository. You should be able to check this by verifying if the latest commit on the master branch of each repository is the same.

I'll be more than happy to help you further as soon as we figure out why in the pull quests are continuously out of date.

[virtadpt]

I think I'm going to try a rebase tonight. I've lost count of the number of git fetch upstream && git pull sequences I've run on my end (as well as git push origin to update my personal fork at Github). I'm doing something wrong, I haven't figured out what yet. The latest commits on the master branches of both of our repos are not the same and I haven't figured out why yet.

[gunthercox]

@virtadpt I'm going to close this ticket off. The drugs.yml file was removed some time ago.

[virtadpt]

Acknowledged.