well I finally paid for workshop...
heh, I got around to that last week
I have so much to get ready. I have not started.
I'm taking friday off to load up
I may have to install the machines, etc, after I get there.
will probably make a final HGR run on friday
I took monday off to recover, so I didn't want to also take friday, although I could sure use it.
uh-oh I better go look for QC30 stuff again then
since you know how well that went last time...
I think most of the entries we had bookmarked are gone
one advantage of friday is they are less busy
probably not QC
they have retention knobs
no they sure aren't
hmm they still show these: http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=80-131-006&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=0
I don't remember if you found this bin and it was empty, or you didn't find it at all
dang - I had two lots of collet chucks bookmarked, they're gone
never found it
that stinks, those are the ones I'd really like.
the one that was picked over was the small plastic bin with the shell mills
I can look again
are these some useful straight shank thing for you? http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=12-247-262&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=1
I can't figure out what they are
the shanks look threaded
oh you're right
well not all - some have a key
might be worth a look anyway
either way, they're probably for some specific machine
they get lots of that kind of stuff
screw machines, etc
[03:37:14] <jmkasunich> http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=05-530-740&searchtable=2&sortExpression=wbprice&SortASC=Yes&pageSize=50¤tPageIndex=5
wish I could tell what size these are
[03:38:32] <jmkasunich> http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=12-276-654&searchtable=2&sortExpression=wbprice&SortASC=Yes&pageSize=50¤tPageIndex=1
my guess is 1/2
100' of 3/4 liquitite flex conduit for $20
that's a good deal
much better than when I misread the price at $250
I wonder if I could sell it at $5 for 10 feet at the workshop?
only if people happen to need it
everyone needs it, they just may not know that
it comes in handy when doing conversions
it's not neat enough to get people to impulse buy it
it's hard to cut though, if it's the metal-core type
but only if your machine doesn't already have conduit runs, _and_ you care enough to use conduit and not just run cable
I can bring a demo cable to show off the advantages of using conduit ;)
"bag of rags" $45
I mean 25
[03:46:02] <SWPadnos> http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=12-276-542&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=0
rich for my tastes tho
also this one: http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=12-276-547&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=0
can't tell what the nose is - that's pretty important
damn -looks new: http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=12-276-568&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=0
and less rich
and two of them in there
I'm sure the price is per each
that company makes motors, and those look like they have motors on the top
yeah, and electrical specs
if they were 1/5 the price I'd maybe be tempted
looks like 3 phase, 60HZ, 230/400V
which doesn't make sense
you don't get that speed from 60Hz
they're probably mixing up specs from the motor and the spindle
the spindle should be rated for a max speed and max HP, but the motor may not provide that
I'm assuming its direct drive
and a motorized spindle assembly is probably rated by what the assembly can do
or they have a cut/paste error for the "additional information"
sure, but who knows where the person read the specs from :)
bookmarked, just to take a look
(are you potentially interested, or just browsing?)
175A 15,000V fuse
just what I needed
mostly browsing, but that could be interesting, especially if one could convince them that both go for one low price :)
renishaw, but not sure what it does
[04:01:12] <jmkasunich> http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=42-496-622&searchtable=2&sortExpression=wbprice&SortASC=Yes&pageSize=50¤tPageIndex=24
just probe extensions maybe?
dunno, you're the one with the renishaw
1,2,4" could give you a lot of extension options
the ends aren't the same, so it doesn't seem like you could stack them
do the ends look even remotely like they'd fit your probe?
oh heyyyy http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=30-589-073&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=1
wonder if those are 3/4
those look like ones that I had book marked and thought were gone
can't be sure
[04:08:04] <SWPadnos> http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=90-163-149&searchtable=1&sortExpression=&SortASC=&pageSize=50¤tPageIndex=0
but cat40 doesn't fit any of our machines
heh, some things get mislabeled - an ignitron tube classified as a fuse
oh - were those cat40? oops
always a little hard to be sure
especially for me, since I don't really know what to look for ;)
well, I bookmarked a few things
I'll check again friday before I go
after midnight again.....
indeedy. night guys
gah! how the hell do you get git to let you merge a remote repo with a local repo, when you don't have explicit knowledge of what the common head is?
is this a hypothetical situation?
I don't think you *can* merge in that case
i guess you could just pick a spot and say that's the common ancestor
well, the actual problem is that I made some changes without pulling first, and now I can't push because the remote tree changed in the meantime
if you pull from the remote tree it'll merge with your local copy
yeah the scenario you describe shouldn't be a problem
what does git-pull actually say now?
are you going to be using git during the fest?
fenn: different project
fatal: entry control.cpp not uptodate. Cannot merge.
fatal: Entry 'control.cpp' not uptodate. Cannot merge.
Merge with Strategy recursive failed
(only one fatal line though)
SWPadnos: OK, git won't actually perform the merge because you have the changes in your local tree.
SWPadnos: so first commit your changes, then merge. You'll get a little diamond shape in your history if you do that.
can't it do the thing cvs up does, where it merges in the master's changes, keeping your local changes on top?
Git doesn't allow a merge if you have uncommited changes, either your
changes are irrelevant and you want to "git reset --hard", or they
are, and you want to commit (and perhaps use "rebase"), or stash them.
[19:50:20] <jepler> http://marc.info/?l=git&m=120272539627389&w=2
I bet rebase is what I remember hearing about
I'm not sure what stash does
* cradek <- not a git user
I had added the changed files, and then committed (to the local repo), then tried to push the changes, which is when the errors started showing up
does 'git status' list control.cpp as modified now?
no, but I had re-saved it after undoing all the edits (it was still open in the editor)
I essentially backed out the edits to the 2 or 3 files then pulled, and now I'm looking at the differences
so at this point are you just trying to get whatever is on the remote master and work from there?
not really - I'm trying to commit changes I've done here so they can use them
I'm trying to get my local stuff to the remote master (if it is a master - I'm not sure of the terminology)
I cloned from it
er, I guess it's called 'origin' and its head is 'master'
whatever, I get the lingo wrong too
it seemed as though I couldn't use the remote URL in some places I thought I should be able to, but I could have been mistyping it
I think you should try: stash / pull / stash apply or commit / pull
you could make a copy of the whole thing before doing it in case the results aren't what you wanted :-P
also I think you should stop saying you're confused about git, since I'm trying to force cradek to adopt it for the office :-P
it looks like most of the changes got merged (or something like that)
there are only a couple of lines that need to change
oh, I like it just fine, but I'm going through the same startup woes as with CVS, SVN, bitkeeper, etc.
oh, and LabView, which has its own semi-revision-management system
I've got a bunch of CD jewel cases I'm bringing - does someone have CDR blanks to take along?
I may have some, but I'm not sure (and they'd be a year or two old)
oh - there's a stack of 100. I guess I'll bring it
my cd blanks are ancient
* jmkasunich <--- on VACATION!
woo HOO! :)