You’re right, I’m not representing the merge correctly. I was thinking of having multiple merges because for a long running patch branch you might merge main into the patch branch several times before merging the patch branch into main.
I’m so used to rebasing I forgot there’s tools that correctly show all the branching and merges and things.
Idk, I just like rebase’s behavior over merge.
I feel the opposite, but for similar logic? Merge is the one that is cluttered up with other merges.
With rebase you get A->B->C for the main branch, and D->E->F for the patch branch, and when submitting to main you get a nice A->B->C->D->E->F and you can find your faulty commit in the D->E->F section.
For merge you end up with this nonsense of mixed commits and merge commits like A->D->B->B’->E->F->C->C’ where the ones with the apostrophe are merge commits. And worse, in a git lot there is no clear “D E F” so you don’t actually know if A, D or B came from the feature branch, you just know a branch was merged at commit B’. You’d have to try to demangle it by looking at authors and dates.
The final code ought to look the same, but now if you’re debugging you can’t separate the feature patch from the main path code to see which part was at fault. I always rebase because it’s equivalent to checking out the latest changes and re-branching so I’m never behind and the patch is always a unique set of commits.
Dang good catch on the second user, I wouldn’t have noticed since I usually don’t look at people’s profiles.
It’s kind of funny that reddit will become this chamber of advertisers making posts and fake users “engaging” while the real people all migrate to lemmy.
That sounds nice, I’ll try that out
Dang, the shared grocery list and meal planning was the best part of it.
I also quit whisk when it became samsung food. Does CopyMeThat let you have shared lists with other people?
Yea I guess I was thinking something like this
I would have to include the donation either in my earnings or report it some other way.
Dang, not sure I’ve cooked green bacon, but I’ve cooked grayish bacon and it comes out ok. It kind of makes me feel better to know they donate expiring meat. It’d be better if they donated it a little earlier, like no one’s buying the gray bacon, but it’s still edible.
I understand the write off part. The part I don’t understand is if you give me $100, and then I donate the $100 (so cost of donation becomes $80), do I have to report that your $100 donation to me as income? Or did I just use your money to decrease my tax burden?
I am also jaded enough to believe most “charitable organizations” are not very charitable.
I’d rather donate to something I know like my local volunteer fire department or community association rather than some org that has too much overhead. And I’m not interested in researching if every org asking for donations is reputable.
You don’t make it sound any better
I wouldn’t say it needs serious work, I kind of like the homebrewed look of it, but there’s a lot of wasted space in the form of padding on mobile. I think the list of posts could just take up the full screen width and it’d be good.
Took a look and the article title is misleading. It says nothing about trust in the technology and only talks about not trusting companies collecting our data. So really nothing new.
Personally I want to use the tech more, but I get nervous that it’s going to bullshit me/tell me the wrong thing and I’ll believe it.
It’s not really fixable, right? They’re technically doing what the platform was made to do.
Same, it’s funny seeing others say they cook at home, so they always use the shaker. I’m just thinking you’re supposed to add it while cooking, not at the table. I have a mason jar full of salt I keep next to the stove.
But fair enough adding it at the table if there’s not enough. For me though if I had to do that, i’d also add some extra to the pot.
Lol yea it’ll probably be delayed. Just saying it’s planned for 2026 not 2032
Over the course of about 30 days, the Artemis III astronauts will travel to lunar orbit, where two crew members will descend to the surface and spend approximately a week near the South Pole of the Moon conducting new science before returning to lunar orbit to join their crew for the journey back to Earth.
Artemis 3, no earlier than Sept 2026
Check out the NASA’s artemis missions. The goal is to put people back on the moon in 2026.
🤯