search

chnm / serendipomatic

http://serendipomatic.org/
26 stars 9 forks source link

weird core/zotero.py reversion #134

Closed erose closed 10 years ago

erose commented 10 years ago

Do we know what caused core/zotero.py to revert to an older version? Someone left a comment to this effect. I retrieved the current version from my machine and fixed it, but it's sort of worrying.

mialondon commented 10 years ago

Thanks for picking this up. When did it happen? If it was the Thursday night before launch then it would be the bad merge, but if it's after that then we do need to make sure people aren't over-writing more recent files on master when pushing their own local changes.

rlskoeser commented 10 years ago

Thanks for finding and fixing this, @erose. I think I added that comment when I noticed the code looked wrong, but I couldn't figure out how it happened. It's possible I did something weird when I was trying to get the zotero oauth to work in one of the other branches, but I feel like I would have noticed that... I always try to review the git diff before I commit my changes, so I make sure I'm committing what I think I am (and hopefully catch stray debug/print statements/etc), and so my commit message reflects the actual changes made.