NP Tony. Thanks for all your help, folks!
On Tuesday, August 11, 2015 at 1:27:42 PM UTC-4, Tony Kelman wrote: > > Need to be slightly more aggressive > > make -C deps distclean-libgit2 && make > > Sorry bout this, will remember to find alternate ways to patch the > dependencies that we get from git from now on. > > > On Tuesday, August 11, 2015 at 10:18:59 AM UTC-7, David Gold wrote: >> >> Thanks, but not working =( >> >> On Tuesday, August 11, 2015 at 12:25:50 PM UTC-4, Isaiah wrote: >>> >>> make -C deps clean-libgit2 && make >>> >>> On Tue, Aug 11, 2015 at 12:23 PM, David Gold <[email protected]> >>> wrote: >>> >>>> I incur the following error after pulling from GitHub and running >>>> `make`: >>>> >>>> Davids-MBP:julia David$ make >>>> >>>> error: Your local changes to the following files would be overwritten >>>> by checkout: >>>> >>>> CMakeLists.txt >>>> >>>> src/openssl_stream.c >>>> >>>> Please, commit your changes or stash them before you can switch >>>> branches. >>>> >>>> Aborting >>>> >>>> make[1]: *** [libgit2/CMakeLists.txt] Error 1 >>>> >>>> make: *** [julia-deps] Error 2 >>>> >>>> >>>> I don't recognize these changes as ones I've ever made. Running `make >>>> cleanall` incurs the same issue. Any thoughts? >>>> >>>> >>>> Thanks, >>>> >>>> D >>>> >>> >>>
