Fork me on GitHub
Slack Archive

This page is not created by, affiliated with, or supported by Slack Technologies, Inc.

2024-05-17

Channels

#clojure-europe
<
2024-05-17
>
otfrom07:05:22

it is truly summer when you drop gelato all down the front of your shirt

1
jasonbell08:05:36

At this time of the morning? Janetta’s can’t be open yet 🙂

grav07:05:25

Morning! I created a few bash aliases functions for git, which I find really clever 😄

grav07:05:59

gfm() {
    main=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')
    git fetch origin $main:$main
}

gmm() {
    main=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')
    git merge $main --no-edit
}
So I can fetch from main|master and merge to my branch, without switching branches

grav07:05:49

But now I wonder if there is a more idiomatic approach to this?

djm07:05:35

[alias]
        update-main = "!git fetch origin main:main"
(in your git config)

djm07:05:58

Isn’t that a more idiomatic way of doing the first one?

grav07:05:15

I've never used git aliases, but I think you're right that they are a better approach than bash functions. However, the main=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@') part finds the primary branch, which is sometimes main, sometimes master (but rarely anything else). I wonder how I'd do that in a git alias?

djm07:05:31

Oh, I see, that’s clever. I also have update-master = "!git fetch origin master:master" and then I have a function in Emacs figures out which is the correct one to use, and calls it

1
djm07:05:53

But you can do most things in a git alias, I have one like this: showt = "!show() { GIT_EXTERNAL_DIFF=difft git show ${1} --ext-diff; }; show", so I guess you could even just move your functions to git aliases, if you think that would be an improvement

grav07:05:34

Ah, cool! Might as well learn to use git aliases!

vijaykiran09:05:53

gmom -> git merge origin/$(git_main_branch)

grav09:05:45

pretty cool! but then I'll need to make the jump from bash to zsh 😬

vijaykiran14:05:28

I can recommend it - zsh has been really a good "upgrade"

1
Thomas Moerman07:05:51

Morning 🧜‍♀️

joetague10:05:30

Morning. Other slacks I am part of have highlighted a section of Slack's https://slack.com/intl/en-gb/trust/data-management/privacy-principles#:~:text=To%20opt%20out%2C%20please%20have,opt%20out%20has%20been%20completed as a concern in relation to Slack building AI/ML models out of all comms. Namely this section: > Contact us to opt out. If you want to exclude your Customer Data from Slack global models, you can opt out. To opt out, please have your org, workspace owners or primary owner contact our Customer Experience team at <mailto:[email protected]|[email protected]> with your workspace/org URL and the subject line ‘Slack global model opt-out request’. We will process your request and respond once the opt-out has been completed. I think @seancorfield is an admin that hangs out here, is this something that the admin team is aware of?

1
reefersleep10:05:31

I assume everyone would be on board with opting out, or indifferent. I vote opt out. And yeah, @seancorfield hangs here 🙂

reefersleep10:05:41

Thank you for highlighting this issue!

martinklepsch10:05:46

I think #C0CB40N8K would be a great place to discuss this further. Not sure if Sean is in the #CBJ5CGE0G channel...

joetague10:05:30

Thanks martin, I'll re-post there.

jasonbell13:05:26

Model tuned on me and @U0525KG62 having a go at each other, I’m fairly sure AI has suffered enough 🙂

jasonbell13:05:18

Most discussion based platforms will harvest as much data to training now to fix search problems that have caused issues over the years.

seancorfield16:05:50

That policy has been in place since September last year but a few "outraged" threads on Twitter seem to suddenly be causing a bit of panic about it. It's been discussed in several Slacks I'm in and some folks think it's a bigger deal than other folks. Several people have reported that their employers think it's a good use of AI and are happy to have it working for them.