I cannot push nor pull to/from my local repo to/from my remote. I get the message "Your branch and 'origin/main' have diverged", etc.

I will be able to fix it, I'm already in the process of refreshing my memory on how to rebase this cleanly.

But ... I am the only person working on this. I have only one local and one central/remote repository. And I never made a branch.

It's just me, working on one computer, right here ... make a few commits locally, then push 'em ... make a few commits locally, then push 'em. That is my entire workflow.

How in the hell did I end up with "my branch" (???) and the origin/main branch being in conflict with each other?

Any Git gurus care to take a stab at this?

Thanks in advance.

Edit, more info:

I am guessing here, but for awhile I was working in a VM on my local machine ... but Android SDK is too much of a resource hog, so I committed and pushed everything on the VM, shut it down, and then pulled latest down to my actual machine ... or at least, that's how I remember it.

My working theory is that, somehow, I screwed up that "switching between machines" process, although, so far, no clue as to how/why I did.

Theory #2 is that Android SDK did something sneaky/stupid behind the scenes -- my last several commits have been done through the Android Studio IDE, not directly in the terminal.

Last Edit:

D'oh!

Found it. I made a couple of "quick changes" to the project's README.md file directly in the remote forge, and that's what screwed me up.

Learn my love of flashlights from Reddit and got this deal. I'm not sponsored or shilling just like this flashlights and wanted to share the deal. (And cut my teeth on posting here.)

Sofirn flashlights are highly regarded in the flashlight community. I've gotten a few of their torches and I've never been disappointed. This is a pretty amazing deal which includes the 18650 Li-ion battery with built in C charging.

https://www.amazon.com/promocode/A1ULCAIBGHXI4S

Note that you have to clip the 20% off coupon on Amazon as well as use the promo for 30% off.

Any other flashlight fans here? What's your poison?

I was pretty shocked when my partner and my best friend both told me that apparently the cheese and tuna omelettes my family has been eating for years aren't normal! I also know a guy at work who likes to eat spaghetti with either mayonnaise or gravy. What strange concoctions have you been eating?

#Poll

If you've seen the film, please rate it at this poll

If you haven't seen the film but would like to see the result of the poll click here

#Rankings

Click here to see the rankings of 2023 films

Click here to see the rankings for every poll done

Summary:

Archaeologist Indiana Jones races against time to retrieve a legendary artifact that can change the course of history.

Director:

James Mangold

Writers:

Jez Butterworth, John-Henry Butterworth, David Koepp

Cast:

• Harrison Ford as Indiana Jones
• Phoebe Waller-Bridge as Helena
• Antonio Banderas as Renaldo
• Karen Allen as Marion
• John Rhys-Davies as Sallah
• Shaunette Renee Wilson as Mason

--
Rotten Tomatoes: 66%

Metacritic: 57

VOD: Theaters

Just sharing since it is a proud moment for me. I've been playing since season 1. I've been grinding and grinding and grinding. I finally hit Diamond 5 in Competitive Mystery Heroes (which I think is the only true, real game mode that's any fun these days). I think I can finally quit now. Thank you.

I am moving apartments soon and will likely not have as much space in my kitchen. Specifically, I am most concerned about an oven, as I doubt I'll be able to get a full sized one.

Has anyone solved this issue? Know of any good, reliable brands (ideally with global shipping)? The last janky toaster oven I ordered from Amazon could barely get a good brownie out, so I hope to make a more solid investment this time that can actually bake things, if it even exists. That said, any compact, high-quality appliance is appreciated.

I just got home after a long, extraordinarily stressful, and sensory overload inducing appointment at a government office that I had to do to get some paperwork dealt with. Partway through it, I realized that some sort of stim/fidget toy would probably help stave off some of the worst of it, if I had something small I could keep in my purse. (Ideally something that wouldn't be too awkward to use in public... though I'm not concerned about looking a little awkward, that ship sailed long ago, haha.) Wondering if anyone here has some good recommendations on stim toys suitable for adults that I could bring with me next time, and/or any suggestions for unobtrusive ways to stim that I could do just on my own without needing anything special. I only found out I was autistic relatively recently (in my 30s), so most of this is still very new to me - any guidance is very appreciated!

Recently Lockheed Martin put out a post on social media [1] where they showed a silhouette of a yet-to-be-revealed aircraft. Most people seem to believe it will be the reveal of their entry to the NGAD program [2] (Next Generation Air Dominance).

While not much is publically known one interesting tidbit is how much it looks like the silhouette of the Testor Corp [3] F-19 [4] model that was released back in the mid 80s. Testor said at the time that the model was based on intelligence (aka leaks) of what would eventually become the F-117.

Aviation forums in the past have said F-19 model is what they WANTED the F-117 and it does look quite a bit like the Have Blue [5] test craft they built, however, the legend is that they couldn't get the math to work for radar deflection properly at that time due to lack of computational power and ended up with the geometrically simpler F117 design we got.

[1] Lockheed Martin Teaser: https://theaviationist.com/wp-content/uploads/2023/07/LM-NGAD-story.jpg
[2] NGAD: https://en.wikipedia.org/wiki/Next_Generation_Air_Dominance
[3] Testor F19: https://en.wikipedia.org/wiki/Testor_Corporation#F-19
[4] Testor F19 Image: https://test803.files.wordpress.com/2018/10/img_6712-1.jpg
[5] Have Blue: https://en.wikipedia.org/wiki/Lockheed_Have_Blue

Having moved away from Reddit, one of the communities I miss most is r/ValorantCompetitive. I’ll probably end up slogging through the main reddit interface just for the post match threads there.

I was wondering if anyone else here follows the scene. If so, how do you keep up with it? Reddit, VLR, elsewhere ?

Cheers :)

For me, I love seeing parts of missions occur before and after we (the playable character) are involved. Like how after a cut scene a character will contribute out that action.

It really helps with the immersion and continuity.

Share what you like to see!

YouTube limits ad blocker usage in new test
YouTube could be testing a three-strikes policy for ad blocking (Update)
So its clear now that YouTube is going to limit the usage of Ad blockers in the coming future
I use Ublock Orgin with Firefox which basically used to block all ads and on mobile device I use NewPipe

The history of the web is littered with with many a dead image/video hosting service. Echos of their existence plague older forums in the form of broken links and images. It seems like they all follow the same path, starting up as the new "simple" service that just hosts images, no fuss. But then as interest grows, so do costs, and the service owners have to scramble to monetize. Generally this is done by stuffing the place full of ads until everyone leaves. Alternatively the owners are stubborn and stick to their guns, until they inevitably have to shut down due to drowning in costs. When they do shut down, millions of assets are lost and the graveyard of broken images across the web grows some more.

https://gfycat.com/ is the latest notable victim of this.

With all the recent social media turmoil, there as been lots of exploration of alternative sites, and all of them have to overcome the problem of hosting media in one way or another.

Tildes obviously does this by avoiding it entirely which, while a very effective solution, is just handballing the problem elsewhere. Users will still want to post images and videos but they will just have to find alternative hosts. Over time those hosts will die and Tildes posts will be filled with dead links.

Mastodon has similar problems,the biggest cost of hosting a mastodon instance is the storage and bandwidth required to facilitate media posts. And there's a real danger of an instance incurring high costs if a particular post becomes popular and is hotlinked on a big centralised social media site.

It seems like a really tricky problem to solve, something peer-to-peer could sort of solve the costs created by traffic peaks but has problems when there is many small files viewed by few individuals each.

Are there any other solutions out there? Web3, IPFS? Or is it just not that much of a problem, do we accept that media on the web is ephemeral and will be lost after a while?

Every time I would be in the market for something particular, say, a keyboard, or a camping tent, I would ask google, “What is the best air fryer, Reddit.”

I would get the link to the subject, however niche it was, and see discussions from assumedly real folks talking about the subject I was curious about. It was informative, and I could research deeper into brands or products I didn’t know about before.

Is there another site that even comes close to that? Or are we currently in a dark period until something like that comes along? I don’t typically use advertised websites to tell me “lists of the top ten handheld gaming consoles.”

Just wondering if there’s an alternative to my previous method of research.

I have a PS VR2 and it's my first headset. I played call of the mountain, a bit of no man's sky, swordsman, tentacular, and beat saber. I was thinking I would buy Synapse tonight, but it has mediocre reviews. I want to start a new game, but am having trouble deciding which one. Here is my short list.

• Synapse - looks super fun, and I like that it's an exclusive, but mediocre reviews
• Song in the smoke - I enjoy survival games and in general prefer non shooter games, so this has an appeal to me.
• Red Matter 2 - this one has some pretty good reviews and I do enjoy sci-fi tv and movies, but don't go out of my way to play sci-fi games
• Moss - I know it's critically acclaimed, but I was really hoping for a first person experience
• the light brigade - I could see myself enjoying this.

Since I can't decide, I think I'll be happy with just about any of these. I'll play the most voted comment!

So me and my wife have temporarily moved in with my parents to save up for a down payment (boy houses are expensive right now). Their house is in a more rural part of Arizona and they have a tons of trails and fire roads that I'm looking at riding when it gets cooler. I have a Canyon Grizl AL 6 with 45mm tires and a rigid carbon fork. The tires are set up tubeless and have pretty good dry grip so I think I should be fine and I would be less than 5 miles from a car accessible road at all times. I have under biked a bit before but not on a desert trail. I was curious if any riders here have any experience and/or advice for taking a gravel bike on single track.

Something that exemplify the mantra "don't judge a book by its cover".

For me it's the puzzle game SquishCraft. The mechanics is innovative and the puzzles are hard as hell. But looking at any videos of it and you might think it's a throwaway flash game from the 2000s or something. Here's a playthrough by a Youtuber in case you want to see the game in action.

^{Meta: Let me know how you feel about having a compilation of the comments included in the topic like this, first time trying so looking for feedback.}

This is a recurring post to discuss programming or other technical projects that we've been working on. Tell us about one of your recent projects, either at work or personal projects. What's interesting about it? Are you having trouble with anything?

So as an American whose love of poetry started in early childhood with A A Milne and Lewis Carroll, I have a theory that the teaching of poetry in typical schools (at least for my generation which may be 30 years out of date re what happens now) that poetry as taught is almost tailor made to destroy any interest in poetry. I like to compare it to introducing music by teaching music theory.

So, if anyone here reads poetry and is willing to talk about it, what poems would you use if you wanted to come up with a gateway drug. They should be easy to appreciate. And on the flip side, if you met someone who said they were really into poetry, are there sophisticated poems that you think are just cool and insightful and moving and impressive in some way? Please feel free to explain your choices or to talk about your experience with poetry in or outside of education.