Hmm, let’s try it, I think you will find them helpful at least. I’ll add a small explanation to the assets page
Speaking of icons, shall I go ahead and swap the basic ones out for Font Awesome icons? I think we were all agreed in the meeting that that would be fine
jasje_
yess
cant see the detach option
ROpdebee has quit
aerozol
You have to right click the component - if you’ve selected something *inside* the component you wont get the option
And you have to click a copy of the main component to detach it
jasje_
aerozol: i see it
they should have unique names for components tbh
aerozol
Do you have the layers window open in figma? You’re on desktop right
jasje_
yes
yvanzo
Hi aerozol, thanks, the new logo looks good.
aerozol
jasje_: components there have a purple icon and they’re highlighted in purple on the figma, I don’t think it’s too bad. But yes… it is possible to accidentally edit a LOT of elements ;)
jasje_
oh yeah i the purple thing
aerozol: still very cool now that youve showed me that
yvanzo
aerozol: About using Git, a merged pull request cannot be reopened once merged. It is less confusing to create a new branch with a new name than to reuse the same again.
aerozol
yvanzo: This is related to me accidentally deleting a fork with an open pull request on it?
yvanzo
Nevermind, I thought that you were using topical branches, but that doesn't seem to be the case.
aerozol
yvanzo: Sometimes when I really mess up my github fork I just delete it and recreate it. I always feel a deep sense of shame when I do it 😬 But last I checked there’s not actually an easy way to reset your fork to the master?
It was dumb of me not to check for open pull requests, I really didn’t think I had any
yvanzo
aerozol: Ok, that's not so good 😅 you can use different branches instead, but it's a bit more of git magic to learn 🪄
Which Git client do you use? git command-line or some UI?
aerozol
yvanzo: I knew, deep down, that I was doing something awful. But it was so easy! I have used branches before though
command-line
(If I use git/github, which has turned out to be pretty much never)
Hmm for creating branches I used the github web interface though.
I have github desktop as well, but because I learnt commandline for some stuff already I haven’t found much use for github desktop
jasje_
going old school huh
yvanzo
either way is fine, but in either case you still have to know that switching to a different branch will change files currently tracked by git
aerozol
The main issue I run into is that I want to change 1 icon or whatever. So I pull the updates from the main server (probably using the github website). And then it says I have commits even though I haven’t changed anything… ugh. I can’t remember what files it always thinks I’ve changed but I’ll ask for help next time it does it. I wonder if my system is dropping something in, but I thought most of those should be
ignored
yvanzo
aerozol: I usually don’t modify the master branch locally, I always create branch to make changes or add new files.
aerozol
yvanzo: So this is your master branch/fork right, and then you make a branch?
My issue is that I pull (before I change anything), and then it immediately says I have commits/changes. I will troubleshoot it next time it comes up...
yvanzo
How I update my local master branch: git checkout master; git pull --ff-only
aerozol
Ooh okay, definitely more in there then the old ‘git pull’
jasje_: so old school, I have a piece of paper with the few commands I need, on my desk 😅
yvanzo
--ff-only will detect if my local master branch has any local commit and prevent the mess
aerozol
That sounds perfect
yvanzo
To create a new branch for a new file: git checkout master -b fun; git add fun.png; git commit -m 'Have fun'; git push
jasje_
i have a notepad file from when i used commandline
aerozol
Might be hitting diminishing returns there re. my commandline use yvanzo - I would probably just create a new branch, sync it to my desktop, and edit/add the files there.
yvanzo
aerozol: if it says you "have commits/changes", use "git log" to check for commits ( you can compare with https://github.com/metabrainz/design-system/com... ) and use "git status" to check for uncommitted changes.
ROpdebee joined the channel
atj
yvanzo: any reason you don't use 'git pull -r'
yvanzo
aerozol: yes, use the best combination for your use (I don't really have to deal with GUI-edited files)
aerozol
Maybe not using commandline for editing is more steps if you’re used to using commandline a lot, but I’m so much more comfortable working with the files and just using git to push/pull etc
Right, that’s pretty much all I’ve ended up doing!
jasje_: have you used plugins in Figma? The Font Awesome one is great (just looking at icons for the LB App UI now)
jasje_
aerozol: no not yet on it
yvanzo
atj: mainly to avoid loosing track of commits/branches made upon the local master HEAD, but that would work too
atj
yvanzo: 👍🏼
yvanzo
atj: about that, let's say there is a branch fun made against master~8, do you know how to find it out from git log?
aerozol
Jasje_: I’ll expand on the note by icon assets to explain to new users to use to plugin
jasje_
alright
atj
yvanzo: i'm not even sure i properly understand what master~8 means tbh :)
yvanzo
sorry I mean master:HEAD~8, the 8th commit in log starting from master HEAD.
atj
right, so that'd be HEAD^^^^^^^^?
yvanzo
:D
I guess :)
atj
I tend to use the ^ notation, and it it's more than 3 commits back I do git log and copy the hash
*if it's
if I need to work out where different branches sit in the tree I use gitk which is cheating really
yvanzo
I just wonder if there is a way to make git log (for a different branch) shows which commits are in master already.
atj
knowing git there probably is, just can't imagine a particularly nice way of doing it in a terminal
s/doing/displaying
yvanzo
Ok, thanks, I will try using gitk for complicated situations.
jasje_ has quit
atj
I find citool very useful for splitting multiple changes in a file into separate commits, which tends to be a bit painful using the cli tools
jasje: jasje_: But it would still be nice to align with BookBrainz etc… we could make an exception for the main menu of the app though. I’ll leave a note on the figma, maybe you want to weight in too akshaaatt
yvanzo
atj: didn't even know its existence, thanks!
outsidecontext
yvanzo: the regular way over the MB web UI
yvanzo
Thanks, that's what I thought, cdtoc/attach isn't a public API.
outsidecontext
Yes, exactly. So Picard does not even have a UI for matching disc ID to release + medium, it just opens the web UI for that
I think the medium ID asked for is the internal ID which is not even a available via API. Is that right?
jasje: akshaaatt: Just added a colour section to the figma, and I saw jasje’s already added Figma colour styles! Awesome. One thing I wanted to remind you both of is that we avoid 100% black and 100% white, for accessibility reasons (they can be hard to define for certain visual disabilities)
One thing I would like to mention is that we should take out a day whenever we decide, to update these icons, colors, text, etc and not work on them actively jasje
I don’t want us to be on an endless loop of updating these. I think it’s a bit early to finalize these things. We need some more tests to conclude on the things to use.
CatQuest
[10:15] <aerozol> Function *before* form (if you remember that discussion from last week!)
👍
this is why we're fweinds aerozol <333
aerozol
🥰
CatQuest
also re github forks. i don't understand why there isn't a "automaticlly update my fork to follow the thing it's forked from if there are no conflicts" option
mayhem
aerozol: ohhh, you're still around.
still semi-awake?
aerozol
baaarely. Writing my mail in review for tomorrow haha
CatQuest
it's one of the things making it harder for me to figure out how to use it :D
mail in review for tomoro.. oh shit aerozol is still in sunday
sleeeep aerozol
🌃
is there an upside down moon emoji
mayhem
aerozol: ok. I really need to organize my thoughts on this project for this week, so I'll ping ya later in the week.
CatQuest
btw anyone speak ukrainian and or polish?
aerozol
mayhem: sounds good, I could do with some hassling to get stuck back into MeB stuff!
CatQuest
can tell me if the tem "tarka" (pl) and "zatula(z)" (uk) are accurate for (musical washboards?)
Hmm, if it helps, NZ always gets the new day before anyone else. Actually, that might be very confusing...
CatQuest
aerozol: it is
aerozol
Yup, early Tue
CatQuest
monkey: oh interesting. i'll keep that in mind once i finally get my ass in gear to do the thing
and i write that list of thingy
first instrument aliases
monkey
No guarantees that is will all perfectly smoothly merge in if you've made modifications to the master branch, but for 90+% of cases it should be a simple click and forget
CatQuest
yea. i imagine if your change had bene re-merged inot he masterbranch that'd be fine
bu yea of course, it's not 100%
it never is :D
monkey
Yeah, that's pretty much the caveat :D
mayhem
lucifer: ping
monkey
Git is great and easy to use ! *
[* Not 100% of the time]
aerozol
Night all! Before I get sucked into any convos : D
mayhem
nn, I'll send you and email aerozol
CatQuest
natta aerozol
🐟 🌃
mayhem
atj: <3
lucifer
mayhem: hi
mayhem
hey.
atj
mayhem: well done if you actually read that email
mayhem
I'll respond to Alexis' email on a personal note, but i think it would be good for you to respond on the technical note, pointing out why that tool won't be sufficient for us. how does that sound?
atj: skimmed it, but am reading now. rabbit hole indeed.
atj
fair simple fix in the end, i'll try and create a PR for the musicbrainz-docker repo but I need to work out where createdb is called
mayhem
yvanzo: and reosarevok should be able to help with that. but that PR would be much appreciated.
actually, I think a better fix is what you suggest at the end -- just go to HTTP. since we have HTTP on the endpoint, lets just use that.
atj
that's a longer term fix, passing -4 to wget is the short term, we might even be able to send them a one liner to add to the Docker compose file