greptilian logo

IRC log for #sourcefu, 2013-03-01

http://sourcefu.com

| Channels | #sourcefu index | Today | | Search | Google Search | Plain-Text | plain, newest first | summary

All times shown according to UTC.

Time S Nick Message
02:55 pdurbin live show in #devhell right now: http://icecast.wondernetwork.com:8000/devhell.m3u
02:56 pdurbin they're asking for questions. i'm suggesting Steve Yegge's posts on liberal vs. conservative in software development: https://plus.google.com/110981030061712822816/posts/KaSKeg4vQtz https://plus.google.com/110981030061712822816/posts/iuRbQe6EoiK
02:56 pdurbin The Development Hell Podcast - /dev/hell - http://devhell.info
03:15 pdurbin This questions was asked: "Any thoughts on how to properly respond to the question: "How long will [huge massive project] take?"
03:15 pdurbin GrumpyCanuck had a funny response. if it'll take you 4 hours, double it to 8 hours, then change the unit of time to 8 days :)
15:32 pdurbin "Which is faster, Lucene or Solr?" -- http://colabti.org/irclogger/irclogger_log/lucene-dev?date=2013-03-01#l155
17:05 pdurbin huh. first time seeing this: git - What does "1 line adds whitespace errors" mean when applying a patch? - Stack Overflow - http://stackoverflow.com/questions/12396622/what-does-1-line-adds-whitespace-errors-mean-when-applying-a-patch
17:29 pdurbin yuck. "Merge conflict ... Failed to merge in the changes ... Patch failed" with `git rebase develop` but `git mergetool` helped me out again: http://irclog.greptilian.com/sourcefu/2013-02-15#i_3368
17:31 pdurbin it prompted me to use opendiff which worked great: http://www.markomedia.com.au/opendiff-and-filemerge-on-os-x/
17:31 pdurbin then just `git rebase --continue`
17:37 ben_e i like meld quite a bit for GUI diff/merge tools
17:37 pdurbin shoot, i lost my list of choices. one was vimdiff
18:14 spilth joined #sourcefu
19:41 pdurbin wow, so after my git merge i ran into this bug in netbeans: Bug 197983 – Duplicate Class error - http://netbeans.org/bugzilla/show_bug.cgi?id=197983 ... and someone made a github repo explain how to reproduce it: https://github.com/hennr/NetBeansDupplicateClassMergeBug :)
19:42 pdurbin for me on OS X Mountain Lion, the fix was to close netbeans, run cd ~/Library/Caches/NetBeans && mv 7.2.1 7.2.1.moved

| Channels | #sourcefu index | Today | | Search | Google Search | Plain-Text | plain, newest first | summary

http://sourcefu.com