-
Leo_Verto
eh, git shouldn't know about that file anymore
2016-01-23 02350, 2016
-
gcilou
Well, I tried removing it and it doesn't work. And I can't find it manually
2016-01-23 02316, 2016
-
Leo_Verto
soo, is it still there?
2016-01-23 02331, 2016
-
Leo_Verto
ah
2016-01-23 02332, 2016
-
Leo_Verto
sorry
2016-01-23 02341, 2016
-
Leo_Verto
too late here already, I guess
2016-01-23 02318, 2016
-
gcilou
Git says that it's creating a new file, but I can't find it anywhere and I can't delete it either
2016-01-23 02359, 2016
-
Leo_Verto
try "git submodule status"
2016-01-23 02345, 2016
-
gcilou
No submodule mapping found in .gitmodules for path 'metabrainz.org'
2016-01-23 02325, 2016
-
Leo_Verto
"git submodule deinit metabrainz.org"
2016-01-23 02347, 2016
-
gcilou
same message^
2016-01-23 02310, 2016
-
Leo_Verto
is there anything in .gitsubmodules?
2016-01-23 02338, 2016
-
gcilou
I don't know how to find out?
2016-01-23 02356, 2016
-
Leo_Verto
ls -la
2016-01-23 02356, 2016
-
gcilou
2016-01-23 02344, 2016
-
Leo_Verto
2016-01-23 02322, 2016
-
gcilou
but isn't it already? Or is that this weird file?
2016-01-23 02341, 2016
-
Leo_Verto
okay, let's talk about git submodules
2016-01-23 02346, 2016
-
gcilou
okay
2016-01-23 02353, 2016
-
Leo_Verto
basically say you have an API you want to include in your project
2016-01-23 02322, 2016
-
Leo_Verto
because having the files from another project that's hosted somewhere sitting in your is pretty stupid, git submodules are a thing
2016-01-23 02345, 2016
-
gcilou
ok
2016-01-23 02315, 2016
-
Leo_Verto
it's like adding a sub-repo, you tell git to clone it and what version to use
2016-01-23 02322, 2016
-
gcilou
ok
2016-01-23 02332, 2016
-
Leo_Verto
the files from that repo are never pushed along with your repo
2016-01-23 02359, 2016
-
gcilou
okay
2016-01-23 02324, 2016
-
Leo_Verto
2016-01-23 02337, 2016
-
Leo_Verto
which makes absolutely no sense
2016-01-23 02341, 2016
-
gcilou
ok so delete it
2016-01-23 02344, 2016
-
Leo_Verto
yep
2016-01-23 02353, 2016
-
Leo_Verto
we rolled back to what was what I assumed a commit before the submodule was added
2016-01-23 02317, 2016
-
gcilou
2016-01-23 02354, 2016
-
Leo_Verto
use the bash rm -rf
2016-01-23 02309, 2016
-
gcilou
2016-01-23 02348, 2016
-
Leo_Verto
um
2016-01-23 02327, 2016
-
Leo_Verto
I guess I'm just way too tired because I don't see what that folder should be doing there?
2016-01-23 02312, 2016
-
Leo_Verto
2016-01-23 02316, 2016
-
gcilou
ohh but still that new file is there..
2016-01-23 02314, 2016
-
Leo_Verto
ugh, turns out that was an empty folder created at some point during building
2016-01-23 02329, 2016
-
gcilou
soo
2016-01-23 02340, 2016
-
gcilou
would this work " git reset HEAD metabrainz.org" ? To unstage the added file?
2016-01-23 02327, 2016
-
Leo_Verto
honestly, I've reached the end of my git-fu, I've never seen anything like this before
2016-01-23 02343, 2016
-
Leo_Verto
I'd say force pull from upstream, continue working and just ignore it for now
2016-01-23 02343, 2016
-
jgh40 joined the channel
2016-01-23 02345, 2016
-
gcilou
hm okay
2016-01-23 02311, 2016
-
gcilou
whats the command for that ^
2016-01-23 02327, 2016
-
jgh40
ruaok,zas: ping
2016-01-23 02341, 2016
-
Leo_Verto
git pull --force <whateveryourforkremoteiscalled>
2016-01-23 02306, 2016
-
gcilou
2016-01-23 02301, 2016
-
Leo_Verto
2016-01-23 02310, 2016
-
gcilou
hm ok
2016-01-23 02339, 2016
-
gcilou
:DD I fixed it!!
2016-01-23 02356, 2016
-
Leo_Verto
how?
2016-01-23 02327, 2016
-
gcilou
well ^^ that did work, then i just committed, then forced pushed :)
2016-01-23 02333, 2016
-
Leo_Verto
oh
2016-01-23 02343, 2016
-
gcilou
2016-01-23 02359, 2016
-
Leo_Verto
btw, I found an alternative to using the "short" class
2016-01-23 02305, 2016
-
Leo_Verto
2016-01-23 02346, 2016
-
JesseW joined the channel
2016-01-23 02358, 2016
-
gcilou
hm, well I think short works fine for now
2016-01-23 02323, 2016
-
ruaok
jgh40: what's up?
2016-01-23 02346, 2016
-
jgh40
ruaok: baron is completed if you want to verify anything
2016-01-23 02340, 2016
-
gcilou
Leo_Verto: You done for the night?
2016-01-23 02345, 2016
-
Leo_Verto
gcilou, but well, I misinterpreted the structure of the site, you'd probably want to use another class to remove the borders
2016-01-23 02348, 2016
-
Leo_Verto
yep, definitely
2016-01-23 02350, 2016
-
ruaok
Very cool! Thank you. Though I'm sure busy right now...
2016-01-23 02304, 2016
-
gcilou
Alright :) I'll take a look
2016-01-23 02308, 2016
-
Leo_Verto
I'm sorry I couldn't help you with git
2016-01-23 02320, 2016
-
gcilou
It's ok, you helped me think about it :)
2016-01-23 02344, 2016
-
jgh40
ruaok: no worries, just wanted to update you. i did update the ticket, as well.
2016-01-23 02340, 2016
-
Leo_Verto
I generally love git and try to use it everywhere, but it's caused me quite a few hours of pain :P
2016-01-23 02354, 2016
-
gcilou
Yes me as well :)
2016-01-23 02339, 2016
-
Leo_Verto
But I wouldn't be using Linux if I didn't like the challenge of that :P
2016-01-23 02308, 2016
-
gcilou
:)
2016-01-23 02314, 2016
-
Leo_Verto
Anyway, night!
2016-01-23 02324, 2016
-
gcilou
Night!
2016-01-23 02329, 2016
-
Leo_Verto has quit
2016-01-23 02345, 2016
-
opatel99 has quit
2016-01-23 02316, 2016
-
opatel99 joined the channel
2016-01-23 02349, 2016
-
opatel99
Today was a GCi hectic day
2016-01-23 02313, 2016
-
opatel99
2016-01-23 02334, 2016
-
jgh40
cool product, but can't even login to the demo sites
2016-01-23 02359, 2016
-
JesseW has quit
2016-01-23 02351, 2016
-
rahulr joined the channel
2016-01-23 02335, 2016
-
typhoe has quit
2016-01-23 02345, 2016
-
typhoe joined the channel
2016-01-23 02316, 2016
-
muzikworm joined the channel
2016-01-23 02357, 2016
-
muzikworm has quit
2016-01-23 02310, 2016
-
JesseW joined the channel
2016-01-23 02348, 2016
-
rahulr has quit
2016-01-23 02319, 2016
-
rahulr joined the channel
2016-01-23 02328, 2016
-
JesseW has quit
2016-01-23 02353, 2016
-
jgh40 has quit
2016-01-23 02346, 2016
-
opatel99 has quit
2016-01-23 02354, 2016
-
yeeeargh joined the channel
2016-01-23 02315, 2016
-
Mineo has quit
2016-01-23 02329, 2016
-
UmkaDK has quit
2016-01-23 02309, 2016
-
UmkaDK joined the channel
2016-01-23 02301, 2016
-
JonnyJD_ joined the channel
2016-01-23 02335, 2016
-
UmkaDK has quit
2016-01-23 02307, 2016
-
Freso
LordSputnik opatel99, I published it though. So I also kind of added it. :p
2016-01-23 02358, 2016
-
regagain joined the channel
2016-01-23 02357, 2016
-
stanislas
haha
2016-01-23 02318, 2016
-
alastairp
Gentlecat: what are you doing?
2016-01-23 02327, 2016
-
Gentlecat
code review
2016-01-23 02301, 2016
-
zas
ruaok: i completed the baron install, nagios/collectd and basic stuff done. I verified that the 4 new disks are installed and RAID10 is working.
2016-01-23 02326, 2016
-
zas
bitmap: baron is ready. We can start experimenting with the secondary db stuff.
2016-01-23 02312, 2016
-
yeeeargh has quit
2016-01-23 02320, 2016
-
yeeeargh joined the channel
2016-01-23 02351, 2016
-
yeeeargh has quit
2016-01-23 02337, 2016
-
Leo_Verto joined the channel
2016-01-23 02330, 2016
-
D4RK-PH0ENiX has quit
2016-01-23 02315, 2016
-
zas
Fixing search servers
2016-01-23 02341, 2016
-
D4RK-PH0ENiX joined the channel
2016-01-23 02356, 2016
-
opatel99 joined the channel
2016-01-23 02335, 2016
-
opatel99
'morning.
2016-01-23 02326, 2016
-
reosarevok
zas: yay eexperiments
2016-01-23 02333, 2016
-
reosarevok
(that's the fun part of your job, right? :p)
2016-01-23 02346, 2016
-
reosarevok
morning opatel99 :)
2016-01-23 02335, 2016
-
reosarevok
:D
2016-01-23 02311, 2016
-
reosarevok
MB is using 2.110.000K of memory in my Chrome
2016-01-23 02313, 2016
-
reosarevok
No wonder it's slow
2016-01-23 02312, 2016
-
chirlu`
How many tabs?
2016-01-23 02301, 2016
-
reosarevok
Plenty :D
2016-01-23 02332, 2016
-
LordSputnik has quit
2016-01-23 02351, 2016
-
rahulr has left the channel
2016-01-23 02302, 2016
-
rahulr joined the channel
2016-01-23 02354, 2016
-
LordSputnik joined the channel
2016-01-23 02318, 2016
-
LordSputnik is now known as Guest80354
2016-01-23 02309, 2016
-
Leo_Verto
:O
2016-01-23 02343, 2016
-
opatel99
Leo_Verto: Hey!
2016-01-23 02355, 2016
-
Leo_Verto
\o opatel99
2016-01-23 02307, 2016
-
opatel99
\opatel99 ?
2016-01-23 02317, 2016
-
Leo_Verto
:P
2016-01-23 02319, 2016
-
Leo_Verto
trying to get out a few more GCI tasks before the deadline?
2016-01-23 02332, 2016
-
opatel99
There's no point in rushing. Maybe I'll be able to do one today. Then I gotta start on the review of my experience.
2016-01-23 02320, 2016
-
Guest80354 has quit
2016-01-23 02335, 2016
-
gcilou
opatel99, GCi hectic?
2016-01-23 02310, 2016
-
opatel99
Well yesterday was pretty interactive.
2016-01-23 02317, 2016
-
opatel99
I thought it was ^
2016-01-23 02346, 2016
-
gcilou
Yeah, I guess more than normal.
2016-01-23 02317, 2016
-
gcilou thinks there's nothing like cold cheese pizza for breakfast :)
2016-01-23 02348, 2016
-
CallerNo6
When I eat pizza for breakfast, I feel a little sad. "Great. Now what am I going to have for lunch?"
2016-01-23 02323, 2016
-
gcilou
Pizza again! That's my plan :)
2016-01-23 02351, 2016
-
div13 joined the channel
2016-01-23 02341, 2016
-
stanislas
On algo camps from my school the food is so bad, that we are frequently eating pizza for every dish.
2016-01-23 02304, 2016
-
stanislas
It's not so bad gcilou
2016-01-23 02344, 2016
-
gcilou
stanislas, what's not so bad?
2016-01-23 02352, 2016
-
stanislas
eating pizza all the time
2016-01-23 02319, 2016
-
gcilou
Oh I know! I like it :)
