Fork me on GitHub
Slack Archive

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

2023-03-08

Channels

#clojure-europe
<
2023-03-08
>
genRaiy08:03:04

Good morning

🙌 6
❄️ 6
mdiin08:03:48

Good morning

grav08:03:21

güt mürning

grav08:03:41

(swap! !mikkel update ::lips: conj ::coffee:)

grav08:03:19

bummer ... emojis don't seem to work in code blocks 😄

😭 2
mccraigmccraig10:03:19

i think your ☕️ is stuck to your 👄 @U052XLL3A !

😅 2
reefersleep08:03:43

Good morning! The path to the car has been cleared of snow, and the first coffee is down.

🎉 4
☕ 4
❄️ 2
🚗 2
reefersleep10:03:01

When I get conflicts in git, the markings in files now show content from three commits instead of just two. Do you know if this is something that can be configured? I find it confusing, and I thought the previous way of just showing old and new worked fine for me.

mccraigmccraig10:03:39

what are the three: yours, theirs and last-common ?

reefersleep11:03:15

You might be right. It goes like: HEAD, some-sha, the branch I’m merging.

reefersleep11:03:34

I haven’t checked exactly what some-sha is, but your suggestion sounds right

reefersleep10:03:16

idk when this happened, I must have updated the git client

reefersleep10:03:40

(I’m trying to merge)

dharrigan11:03:10

What is your merge.conflictStyle set to?

dharrigan11:03:42

git config -l | grep conflict

reefersleep11:03:31

I was thinking it might be something like this

reefersleep11:03:41

merge.conflictstyle=diff3

reefersleep11:03:18

I’ll try “merge” instead, thank you!

reefersleep09:03:57

It’s how I want it 😄 🥳 cheers @dharrigan, this made my Friday!

🎉 4
mccraigmccraig17:03:23

not what i want to hear from javac: 

An exception has occurred in the compiler

🙀 8
mccraigmccraig17:03:27

fortunately it's just because i upgraded cordova, and it turns out they finally migrated to java11

simongray09:03:19

When I first got a Mac, any time some application crashed it would display a message about the core being dumped or something to that effect, like it’s ejecting the warp core.

mccraigmccraig09:03:15

old skool! i seem to remember poking around in core dumps with gdb back in the days when i still thought C was a good idea

reefersleep09:03:57
replied to a thread:(I’m trying to merge)

It’s how I want it 😄 🥳 cheers @dharrigan, this made my Friday!

🎉 4